Update tempest to fix interfaces_by_fixed_ip

It includes [1] which allows testing even if one shared network is
defined.

[1] https://review.openstack.org/#/c/615425/3

Change-Id: I8bd72ad351a3702e9f72014a1ae43542e5d8e927
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 6c54a4c..d35f817 100644 (file)
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-core:hunter
 
 ARG BRANCH=stable/hunter
 ARG OPENSTACK_TAG=stable/rocky
+ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf
 ARG RALLY_TAG=1.2.1
 ARG RALLY_OPENSTACK_TAG=1.3.0
 ARG OS_FAULTS_TAG=0.1.18
@@ -10,10 +11,15 @@ 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 /^tempest==+.*$/d \
         > 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 && \
@@ -30,7 +36,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 \
-        tempest /src/rally-openstack /src/os-faults && \
+        /src/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 && \