summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-06 21:38:38 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-06 23:41:06 +0200
commitf2353484ddcca794d2c86d3dbe4d026ac906643f (patch)
treedcc7226c488faa1acccf51a4672cb9eab78573bf
parentd24a8f4bba627004ac4fcc27a8c85169c76cbb78 (diff)
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>
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/Dockerfile.aarch642
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 \