summaryrefslogtreecommitdiffstats
path: root/docker/vnf
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 18:55:40 +0100
commitbb905f530dce0c6124afbebefc6bc2c78c644e86 (patch)
tree97d0c6f7913ba0fc4d05b72cdac80553bd180e0f /docker/vnf
parenta5b19c79cfe340a607a909e8a7ca38eef15f8d43 (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/vnf')
-rw-r--r--docker/vnf/Dockerfile12
1 files changed, 7 insertions, 5 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 2590de5f0..7712668c8 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -2,6 +2,8 @@ FROM opnfv/functest-core:gambia
ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
+ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf
+ARG OSLO_CONCURRENCY=3.27.0
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
ARG CLOUDIFY_VIMS_TAG=gambia
@@ -22,11 +24,11 @@ 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@$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 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 && \