aboutsummaryrefslogtreecommitdiffstats
path: root/docker/healthcheck
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-02-15 11:08:20 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-02-15 11:19:45 +0100
commitfa8c50f4fd19576a2fde5b04077810d4ca91b330 (patch)
treed5347448bf236f488b398157984dc3b869696780 /docker/healthcheck
parent3393f2016483555c27d612c69ec11274cc8aa72a (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>
Diffstat (limited to 'docker/healthcheck')
-rw-r--r--docker/healthcheck/Dockerfile9
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 1932c45be..3a854bfb1 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -7,11 +7,10 @@ ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev openssl-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#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 && \
pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
-rthirdparty-requirements.txt && \
git init /src/odl_test && \