Set repo_tempest to /src/tempest

It also calls pip install via the right src value to prevent from
changing the working dir when building Ubuntu or Alpine containers.

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 781589a..2e37796 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -76,7 +76,7 @@ RUN git config --global http.sslVerify false
 COPY thirdparty-requirements.txt 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 \
+    pip install --src /src -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 \

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 1ae52cd..98bcce9 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -75,7 +75,7 @@ RUN git config --global http.sslVerify false
 COPY thirdparty-requirements.txt 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 \
+    pip install --src /src -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 \

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 1807082..77a52c6 100644 (file)
--- 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/.tempest
+        repo_tempest:       /src/tempest
         dir_repo_releng:    /home/opnfv/repos/releng
         repo_vims_test:     /home/opnfv/repos/vnfs/vims-test
         repo_onos:          /home/opnfv/repos/onos