diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-28 14:36:56 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-28 14:36:56 +0200 |
| commit | 63bce65d3c20ce7b52396dbdf4c944da069ea0d7 (patch) | |
| tree | afcced23a329b72a75cbf9c43b01bec088af8545 /docker | |
| parent | 9c969dc408c2100f0106d9eb6466b58c421a287e (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>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 2 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a3ebc1a1c..6ac2d0756 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 1a7dc0279..60e4ea82f 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 f51a5e29d..3e5eb60a3 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 |