diff options
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 4 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 2 | ||||
| -rw-r--r-- | functest/ci/config_functest.yaml | 1 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 6 |
5 files changed, 7 insertions, 10 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 6f7aee72..d38713e0 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,8 +117,7 @@ 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 \ +RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \ && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh RUN add_images.sh diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index d68c4907..77c94b02 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,8 +109,7 @@ 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 \ +RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \ && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh RUN add_images.sh diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index f51a5e29..a528bef8 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 +tosca-parser>=0.7.0 # Apache-2.0 +heat-translator>=0.4.0 # Apache-2.0 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 ed9df138..42daaa16 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 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index b421dc06..11af9823 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -297,7 +297,7 @@ tiers: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: 'cd /home/opnfv/repos/sdnvpn/sdnvpn/test/functest && python ./run_tests.py' + cmd: 'cd /usr/local/lib/python2.7/dist-packages/sdnvpn/test/functest && python ./run_tests.py' - case_name: security_scan @@ -314,7 +314,7 @@ tiers: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: '. /home/opnfv/functest/conf/stackrc && cd /home/opnfv/repos/securityscanning && python security_scan.py --config config.ini && cd -' + cmd: '. /home/opnfv/functest/conf/stackrc && cd /usr/local/lib/python2.7/dist-packages && python security_scan.py --config config.ini && cd -' - case_name: copper @@ -363,7 +363,7 @@ tiers: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: 'cd /home/opnfv/repos/sfc/sfc/tests/functest && python ./run_tests.py' + cmd: 'cd /usr/local/lib/python2.7/dist-packages/sfc/tests/functest && python ./run_tests.py' - case_name: onos_sfc |