aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-07-05 15:01:40 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-05 15:01:40 +0000
commit0b68c9980659ed2698dcd5f562efa59e715a62db (patch)
treea61fbde1317e1876d80d0170f83ca8826323efca /docker
parentb4cacd1ca87b7cbe7c166a543e8f448b723c837d (diff)
parent6abb165d292dc96eba734a68d17a942e5c333203 (diff)
Merge "Clone tempest before installing the package"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile15
-rw-r--r--docker/Dockerfile.aarch6414
-rw-r--r--docker/thirdparty-requirements.txt2
3 files changed, 17 insertions, 14 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b4bff0e16..781589ade 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -27,7 +27,6 @@ ARG FUNCTEST_IMAGES_DIR=${FUNCTEST_BASE_DIR}/images
ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results
ARG FUNCTEST_DIR=/usr/local/lib/python2.7/dist-packages/functest/
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
@@ -75,12 +74,14 @@ RUN mkdir -p ${REPOS_VNFS_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 6f17d1a62..1ae52cd35 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -26,7 +26,6 @@ ARG FUNCTEST_IMAGES_DIR=${FUNCTEST_BASE_DIR}/images
ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results
ARG FUNCTEST_DIR=/usr/local/lib/python2.7/dist-packages/functest/
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
@@ -74,11 +73,14 @@ RUN mkdir -p ${REPOS_VNFS_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