Stop using tempest version in Dockerfile

The sed instruction is enhanced to automatically copy the version
written in the OpenStack's upper-constraints.txt.

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8c85756..3856cce 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -74,7 +74,7 @@ RUN git config --global http.sslVerify false
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \
-        sed s/^tempest===.*$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@14.0.0#egg=tempest/ \
+        sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
         > upper-constraints.txt && \
     pip install --src /src -cupper-constraints.txt \
         git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index a043628..a42fc31 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -73,7 +73,7 @@ RUN git config --global http.sslVerify false
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \
-        sed s/^tempest===.*$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@14.0.0#egg=tempest/ \
+        sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
         > upper-constraints.txt && \
     pip install --src /src -cupper-constraints.txt \
         git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \