From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 4 Jul 2017 12:29:53 +0000 (+0200)
Subject: Clone tempest before installing the package
X-Git-Tag: opnfv-5.0.RC1~266^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F36915%2F5;p=functest.git

Clone tempest before installing the package

Rally and refstack require a tempest working dir.
It now clones the offical repository before running setup.py develop.
14.0 is selected to conform with OpenStack upper-constraints.txt.

Dockerfile downloads the official OpenStack upper-constraints.txt to
remove the condition about tempest which forbids cloning it.

Change-Id: I8410570d660b07a1ecfc48fab93022f72acdaac7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 08c205dab..abd9e7cf1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,7 +28,6 @@ ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results
 ARG FUNCTEST_REPO_DIR=${REPOS_DIR}/functest
 ARG FUNCTEST_TEST_DIR=${FUNCTEST_REPO_DIR}/functest/opnfv_tests
 ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
-ARG PIP_OPTS=-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata
 
 # Environment variables
 ENV HOME /home/opnfv
@@ -77,12 +76,14 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \
 RUN git config --global http.sslVerify false
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN pip install ${PIP_OPTS} \
-    git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
-    git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \
-    git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \
-    -r thirdparty-requirements.txt \
-    && rm thirdparty-requirements.txt
+RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \
+        sed /^tempest===.*$/d > upper-constraints.txt && \
+    pip install -cupper-constraints.txt \
+        git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
+        git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \
+        git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \
+        -r thirdparty-requirements.txt && \
+    rm thirdparty-requirements.txt upper-constraints.txt
 
 # OPNFV repositories
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 36f6d677f..72f994940 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -27,7 +27,6 @@ ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results
 ARG FUNCTEST_REPO_DIR=${REPOS_DIR}/functest
 ARG FUNCTEST_TEST_DIR=${FUNCTEST_REPO_DIR}/functest/opnfv_tests
 ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
-ARG PIP_OPTS=-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata
 
 # Environment variables
 ENV HOME /home/opnfv
@@ -76,11 +75,14 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \
 RUN git config --global http.sslVerify false
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN pip install ${PIP_OPTS} \
-    git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
-    git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \
-    git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \
-    -r thirdparty-requirements.txt && rm thirdparty-requirements.txt
+RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \
+        sed /^tempest===.*$/d > upper-constraints.txt && \
+    pip install -cupper-constraints.txt \
+        git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
+        git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \
+        git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \
+        -r thirdparty-requirements.txt && \
+    rm thirdparty-requirements.txt upper-constraints.txt
 
 # OPNFV repositories
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index cd56a0681..82fe4efdc 100644
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -6,5 +6,5 @@ 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
 rally
-tempest>=12.1.0 # Apache-2.0
+-e git+https://github.com/openstack/tempest@14.0.0#egg=tempest # Apache-2.0
 git+https://github.com/openstack/refstack-client#egg=refstack-client