diff options
| -rw-r--r-- | docker/features/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index bb0ef2881..2fd2883fb 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -2,6 +2,8 @@ FROM opnfv/functest-tempest:gambia ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens +ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf +ARG OSLO_CONCURRENCY=3.27.0 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update python3 sshpass && \ @@ -9,7 +11,8 @@ RUN apk --no-cache add --update python3 sshpass && \ python-dev python3-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 s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \ + sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ \ + sed -E s/^oslo.concurrency==+.*$/oslo.concurrency===$OSLO_CONCURRENCY/ \ > 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 && \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index e12279e28..55be38dd8 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -2,6 +2,8 @@ FROM opnfv/functest-tempest:gambia ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens +ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf +ARG OSLO_CONCURRENCY=3.27.0 ARG REFSTACK_TARGET=2018.02 ARG PATROLE_TAG=0.3.0 ARG NEUTRON_TAG=0.2.0 @@ -12,7 +14,8 @@ 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 s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \ + sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ | \ + sed -E s/^oslo.concurrency==+.*$/oslo.concurrency===$OSLO_CONCURRENCY/ \ > 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 && \ diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index a278aacc0..815c4d2ba 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -2,6 +2,8 @@ FROM opnfv/functest-core:gambia ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens +ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf +ARG OSLO_CONCURRENCY=3.27.0 ARG RALLY_TAG=1.1.0 ARG RALLY_OPENSTACK_TAG=1.2.0 ARG OS_FAULTS_TAG=0.1.17 @@ -10,7 +12,8 @@ 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 s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \ + sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ \ + sed -E s/^oslo.concurrency==+.*$/oslo.concurrency===$OSLO_CONCURRENCY/ \ > 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 && \ |