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/core/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/core/Dockerfile')
| -rw-r--r-- | docker/core/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 2c2e288c2..a6d88e256 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -10,12 +10,12 @@ RUN apk --no-cache add --update \ 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.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ - sed -E /#egg=functest/d > upper-constraints.txt && \ - pip install --no-cache-dir --src /src -cupper-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.opnfv.txt \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ pip==$PIP_TAG && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ + pip install --no-cache-dir --src /src -cupper-constraints.opnfv.txt \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ -e git+https://git.openstack.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ git init /src/functest && \ @@ -23,10 +23,10 @@ RUN apk --no-cache add --update \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/functest && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ + pip install --no-cache-dir --src /src -cupper-constraints.opnfv.txt \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ /src/functest && \ - rm -r upper-constraints.txt /src/functest && \ + rm -r upper-constraints.opnfv.txt /src/functest && \ cp /usr/lib/python2.7/site-packages/functest/ci/logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/ && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ |