summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-05 22:37:02 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-06 07:47:19 +0200
commit26c6f1aefce88a11e241eea7f7bb9fa0d6795b4e (patch)
tree891bc80234057554e562d9e726994e0e84a96050
parent1bcf3137564e0b5ab396c35d209ca448ee1f74e5 (diff)
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>
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/Dockerfile.aarch642
-rw-r--r--functest/ci/config_functest.yaml2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 781589ade..2e377966a 100644
--- 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 1ae52cd35..98bcce96c 100644
--- 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 1807082d9..77a52c659 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/.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