From bb905f530dce0c6124afbebefc6bc2c78c644e86 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 15 Feb 2019 11:08:20 +0100 Subject: Harden upper-constraints.txt operations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit fa8c50f4fd19576a2fde5b04077810d4ca91b330) --- docker/tempest/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'docker/tempest/Dockerfile') diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 5012b2717..4bafc6391 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -11,12 +11,11 @@ ARG OS_FAULTS_TAG=0.1.17 RUN apk --no-cache add --virtual .build-deps --update \ python-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 && \ git init /src/os-faults && \ (cd /src/os-faults && \ git fetch --tags https://git.openstack.org/openstack/os-faults.git $OS_FAULTS_TAG && \ -- cgit 1.2.3-korg