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 18:55:40 +0100 |
| commit | bb905f530dce0c6124afbebefc6bc2c78c644e86 (patch) | |
| tree | 97d0c6f7913ba0fc4d05b72cdac80553bd180e0f /docker/features/Dockerfile | |
| parent | a5b19c79cfe340a607a909e8a7ca38eef15f8d43 (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/features/Dockerfile')
| -rw-r--r-- | docker/features/Dockerfile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index cbd7a472d..4949b6c15 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -10,12 +10,11 @@ RUN apk --no-cache add --update python3 sshpass && \ apk --no-cache add --virtual .build-deps --update \ python-dev python3-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@$TEMPEST_TAG#egg=tempest/ | \ - sed -E s/^oslo.concurrency==+.*$/oslo.concurrency===$OSLO_CONCURRENCY/ \ - > 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 && \ + sed -i -E s/^oslo.concurrency==+.*$/oslo.concurrency===$OSLO_CONCURRENCY/ 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 && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -cupper-constraints.opnfv.txt \ -rthirdparty-requirements.txt && \ |