From ef5cb916b85336057dc7a9000d53285257d1f851 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 21 Jun 2017 16:20:13 +0200 Subject: [PATCH] Clone tempest repository in the Docker image Rally needs to have a copy of the Tempest repository in order to install the verifier. Otherwise, rally will clone it automatically anyway. This also uplifts the tempest version to 15.0.0 which targets Ocata deployments according to [1] [1]: https://releases.openstack.org/ocata/ Change-Id: I30e922a261a4ab1875d48c4754df09426b5f67e4 Signed-off-by: jose.lausuch --- docker/Dockerfile | 1 + docker/Dockerfile.aarch64 | 1 + docker/thirdparty-requirements.txt | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 95c4df30d..d3f9d0465 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -104,6 +104,7 @@ RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera # other repositories +RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git ${REPOS_DIR}/odl_test RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_VNFS_DIR}/vims-test RUN git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-functest-vrouter.git ${REPOS_VNFS_DIR}/vrouter diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 0c1b0024d..f240523ea 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -97,6 +97,7 @@ RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera # other repositories +RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git ${REPOS_DIR}/odl_test RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_VNFS_DIR}/vims-test RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index d9ad368e2..064b51850 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -2,5 +2,5 @@ git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests networking-bgpvpn kingbird rally -tempest>=12.1.0 # Apache-2.0 +tempest>=15.0.0 # Apache-2.0 git+https://github.com/openstack/refstack-client#egg=refstack-client -- 2.16.6