diff options
| -rw-r--r-- | docker/features/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile | 9 |
3 files changed, 6 insertions, 9 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 194d23c21..275d73518 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -2,6 +2,7 @@ FROM opnfv/functest-tempest:hunter ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky +ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update python3 sshpass && \ @@ -9,7 +10,7 @@ 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/ \ > 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 8b6bc428c..e5e266141 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -2,6 +2,7 @@ FROM opnfv/functest-tempest:hunter ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky +ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf ARG REFSTACK_TARGET=2018.02 ARG PATROLE_TAG=0.4.0 ARG NEUTRON_TAG=0.2.0 @@ -12,7 +13,7 @@ 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/ \ > 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 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 && \ |