summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2017-06-27 11:54:41 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2017-06-27 12:06:42 +0200
commitc052d52d30bb4aad229fef04560a3f71dff0cab5 (patch)
tree82f808c59ed96f47d97e6a317b1c5875b163ccfa
parent3409bc4eaf88b78e15b045afbd6b461c3fb281e7 (diff)
Remove Tempest repo and use the one created by Refstack
Refstack clones the repo in /home/opnfv/.tempest. Rally can use that repo which is checked out to the REFSTACK_TAG=15.0.0 This way, we avoid having twice the same files. Change-Id: I9b05d29b1c9bdf3d10539b771d0d20abb2b7cc37 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/Dockerfile.aarch642
-rw-r--r--functest/ci/config_functest.yaml2
3 files changed, 1 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4c03a697d..7b899e6bd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,6 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
# Environment variables
ARG BRANCH=master
ARG RALLY_TAG=0.8.1
-ARG TEMPEST_TAG=15.0.0
ARG REFSTACK_TAG=15.0.0
ARG ODL_TAG=release/beryllium-sr4
ARG KINGBIRD_TAG=1.1.0
@@ -100,7 +99,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_D
RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
# 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 1d47aa426..a3bb4616f 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -14,7 +14,6 @@ LABEL version="0.1" description="OPNFV Functest Aarch64 Docker container"
# Environment variables
ARG BRANCH=master
ARG RALLY_TAG=0.8.1
-ARG TEMPEST_TAG=15.0.0
ARG REFSTACK_TAG=15.0.0
ARG ODL_TAG=release/beryllium-sr4
ARG KINGBIRD_TAG=0.2.2
@@ -93,7 +92,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_D
RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
# 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/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 623092a53..9c15ee2a5 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -3,7 +3,7 @@ general:
home: /home/opnfv
repos: /home/opnfv/repos
dir_repo_rally: /home/opnfv/repos/rally
- repo_tempest: /home/opnfv/repos/tempest
+ repo_tempest: /home/opnfv/.tempest
dir_repo_releng: /home/opnfv/repos/releng
repo_vims_test: /home/opnfv/repos/vnfs/vims-test
repo_sdnvpn: /home/opnfv/repos/sdnvpn