aboutsummaryrefslogtreecommitdiffstats
path: root/docker/tempest/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-02-02 00:59:02 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-02-02 00:59:02 +0100
commit772d3f8ad272cd999faa85fb2726d32002c1f5c0 (patch)
treed225a71817da9c2225d3990169613cc7e2bd7981 /docker/tempest/Dockerfile
parentcfb5685070616ff131ddf7e586a3e220b74c8cae (diff)
Override tempest upper-contraints
Change-Id: Ieadf7ec3d1b05eefa6634db5f3d0ea264e9994af Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/tempest/Dockerfile')
-rw-r--r--docker/tempest/Dockerfile9
1 files changed, 2 insertions, 7 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index d35f8173d..dbda15e9c 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -11,15 +11,10 @@ RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev && \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
- sed -E /^tempest==+.*$/d \
+ sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ \
> upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
- git init /src/tempest && \
- (cd /src/tempest && \
- git fetch --tags https://git.openstack.org/openstack/tempest.git $TEMPEST_TAG && \
- git checkout FETCH_HEAD) && \
- update-requirements -s --source /src/openstack-requirements /src/tempest/ && \
git init /src/os-faults && \
(cd /src/os-faults && \
git fetch --tags https://git.openstack.org/openstack/os-faults.git $OS_FAULTS_TAG && \
@@ -36,7 +31,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
git checkout FETCH_HEAD) && \
update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \
pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
- /src/tempest /src/rally-openstack /src/os-faults && \
+ tempest /src/rally-openstack /src/os-faults && \
pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
/src/rally && \
rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/os-faults /src/rally /src/rally-openstack && \