summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-06-22 07:49:18 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-22 07:49:18 +0000
commite62f0f289621c843e60f21f69a8e87e7d2778f36 (patch)
tree1d82385ad71d7cfc08bc4845627f8a304e6ee079
parent4d669670f13e5ab4394a2c9e38073bf7281555ae (diff)
parentef5cb916b85336057dc7a9000d53285257d1f851 (diff)
Merge "Clone tempest repository in the Docker image"
-rw-r--r--docker/Dockerfile1
-rw-r--r--docker/Dockerfile.aarch641
-rw-r--r--docker/thirdparty-requirements.txt2
3 files changed, 3 insertions, 1 deletions
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