aboutsummaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-04 14:29:53 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-05 09:30:23 +0200
commit6abb165d292dc96eba734a68d17a942e5c333203 (patch)
treebe811b0d8310233a1bb5861188612de1f7f85b88 /docker/Dockerfile
parentc68b71a8024359bb4754fd561c5e3c2b43613f03 (diff)
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>
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile15
1 files changed, 8 insertions, 7 deletions
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