diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-02-15 11:08:20 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-02-15 17:09:20 +0100 |
| commit | d72913a4cac2347cb985f18c25dc9a8aa9e9131a (patch) | |
| tree | 5540c3ca3ce3d5808fee5e206cb2353dcfcb3418 /docker/benchmarking/Dockerfile | |
| parent | 1a37af78f9cb9966daf7d1e31931c8f73c059aa0 (diff) | |
Harden upper-constraints.txt operations
It takes into account the wget exit values and avoids manipulating a
falsy empty file.
It won't help fixing the network outages in LF network which have been
highlighted by false failures in api_check (the wrong snaps package
is installed [1])
[1] https://build.opnfv.org/ci/job/functest-opnfv-functest-healthcheck-latest-api_check-run/100/console
Change-Id: Ic9b75965b1ffb1f7bb342ff216bda9933ca75f0b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit fa8c50f4fd19576a2fde5b04077810d4ca91b330)
Diffstat (limited to 'docker/benchmarking/Dockerfile')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 7f58c00e6..110dcdcba 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -2,17 +2,17 @@ FROM opnfv/functest-tempest:hunter ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky +ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7 RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-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/ \ - > 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 && \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \ + sed -i -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 > upper-constraints.opnfv.txt && \ + sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ git init /src/vmtp && \ (cd /src/vmtp && \ git fetch --tags https://git.openstack.org/openstack/vmtp.git $VMTP_TAG && \ |