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/benchmarking | |
| 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/benchmarking')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 240347463..2ad63fbd0 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -10,11 +10,10 @@ RUN apk --no-cache add --update libxml2 libxslt && \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-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 && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" pip3 install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml ;; esac && \ git init /src/vmtp && \ (cd /src/vmtp && \ |