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 11:19:45 +0100 |
| commit | fa8c50f4fd19576a2fde5b04077810d4ca91b330 (patch) | |
| tree | d5347448bf236f488b398157984dc3b869696780 /docker/vnf | |
| parent | 3393f2016483555c27d612c69ec11274cc8aa72a (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/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index ec33623f4..90efb8609 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -22,11 +22,10 @@ RUN apk --no-cache add --update \ procps libxslt libxml2 zlib libffi python3 go musl-dev && \ apk --no-cache add --virtual .build-deps --update \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ make && \ - 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 && \ git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \ sed -i s/unf_ext\ \(.*\)/unf_ext\ \(0.0.7.4\)/g /src/vims-test/Gemfile.lock && \ git init /src/vims-test/quaff && \ |