aboutsummaryrefslogtreecommitdiffstats
path: root/docker/tempest/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-05-28 13:36:25 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-05-28 15:23:20 +0200
commit7a628f087403089d282cda14bcba858d8b0bc6c3 (patch)
tree07e9119f71587f6d862e94e62e1ff8aa01a52a66 /docker/tempest/Dockerfile
parente81b38efc985539dd751ab5138b1834ce3794e64 (diff)
Remove PyNacl contraints in Features
It conforms with "Install PyNaCl via package" [1]. functest-feature may raise timeouts when cross-compiling PyNacl [2]. [1] https://gerrit.opnfv.org/gerrit/#/c/67956/ [2] https://travis-ci.org/collivier/functest/jobs/538119733 Change-Id: I986677b869f62caee6be219ee1de622b7bc20ca4 Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>
Diffstat (limited to 'docker/tempest/Dockerfile')
-rw-r--r--docker/tempest/Dockerfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 2a70e4b4c..8ad688c83 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -12,6 +12,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
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#egg=tempest/ upper-constraints.txt && \
sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ 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 && \
git init /src/rally && \