aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-06-28 14:36:56 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-06-28 14:36:56 +0200
commit63bce65d3c20ce7b52396dbdf4c944da069ea0d7 (patch)
treeafcced23a329b72a75cbf9c43b01bec088af8545
parent9c969dc408c2100f0106d9eb6466b58c421a287e (diff)
Leverage on parser python packages in Dockerfile
It also stops calling parser_install.sh. This file is replaced by the 2 new requirements in docker/thirdparty-requirements.txt: - tosca-parser - heat-translator Change-Id: Ic9dcdd81df9800fc8e559a07f9c100a20bea2290 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/Dockerfile.aarch642
-rw-r--r--docker/thirdparty-requirements.txt2
-rw-r--r--functest/ci/config_functest.yaml1
4 files changed, 2 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a3ebc1a1..6ac2d075 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -90,7 +90,6 @@ RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/f
# OPNFV repositories
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
@@ -118,7 +117,6 @@ RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \
-not -path "*functest_venv*" \
|xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
-RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
RUN wget -q https://raw.githubusercontent.com/openstack/rally/${RALLY_TAG}/install_rally.sh \
&& bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 1a7dc027..60e4ea82 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -85,7 +85,6 @@ RUN pip install ${PIP_OPTS} \
# OPNFV repositories
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
@@ -110,7 +109,6 @@ RUN find -L ${FUNCTEST_REPO_DIR} -name "*.py" \
-not -path "*functest_venv*" \
|xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
-RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
RUN wget -q https://raw.githubusercontent.com/openstack/rally/${RALLY_TAG}/install_rally.sh \
&& bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index f51a5e29..3e5eb60a 100644
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -3,6 +3,8 @@ git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
git+https://gerrit.opnfv.org/gerrit/opera#egg=opera
git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning
git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
+git+https://gerrit.opnfv.org/gerrit/parser#egg=tosca-parser&subdirectory=tosca2heat/tosca-parser
+git+https://gerrit.opnfv.org/gerrit/parser#egg=heat-translator&subdirectory=tosca2heat/heat-translator
networking-bgpvpn
rally
tempest>=15.0.0 # Apache-2.0
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 1199be5a..2e86cc54 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -11,7 +11,6 @@ general:
repo_barometer: /home/opnfv/repos/barometer
repo_doctor: /home/opnfv/repos/doctor
repo_copper: /home/opnfv/repos/copper
- repo_parser: /home/opnfv/repos/parser
repo_domino: /home/opnfv/repos/domino
repo_snaps: /home/opnfv/repos/snaps
repo_fds: /home/opnfv/repos/fds