aboutsummaryrefslogtreecommitdiffstats
path: root/docker/vnf
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-03 13:40:19 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-03 13:43:18 +0200
commitdfdcc84610b8b71abf95d53e8647c95bdb188cfe (patch)
tree3beb48c36728d5b2d009fad000e863cb86928f5f /docker/vnf
parent0a651499f39ae6b327bbeeba821e55f21f3404fc (diff)
Fix upper-constraints in tempest-based containers
Change-Id: Id7f82b314af05c6b8ec47ef3685fcc806e72f1a6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 749613f723ac25dc161b4311d20e3e691b7a8341)
Diffstat (limited to 'docker/vnf')
-rw-r--r--docker/vnf/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 4cdf64b66..3f67508a6 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -25,7 +25,7 @@ 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 && \