diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-03 13:40:19 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-04-03 13:40:19 +0200 |
| commit | 749613f723ac25dc161b4311d20e3e691b7a8341 (patch) | |
| tree | 5f84fd4e10837bafcee3cbe1ebbda93e08e42984 /docker/vnf | |
| parent | b55cfa52c46688ac8bce404b80e75ae91bda3ef8 (diff) | |
Fix upper-constraints in tempest-based containers
Change-Id: Id7f82b314af05c6b8ec47ef3685fcc806e72f1a6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index c38f0ddb2..a7dcbac7d 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -25,11 +25,10 @@ RUN apk --no-cache add --update \ apk --no-cache add --virtual .build-deps --update \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ - sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ + sed -i -E /#egg=tempest/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ 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 && \ - sed -i -E /#egg=tempest/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 && \ |