From f2353484ddcca794d2c86d3dbe4d026ac906643f Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 6 Jul 2017 21:38:38 +0200 Subject: Stop using tempest version in Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/Dockerfile | 2 +- docker/Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8c8575643..3856cce70 100644 --- 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 a043628d3..a42fc3160 100644 --- 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 \ -- cgit 1.2.3-korg