From 9d47f817762c03e2b34e8f847f2616ffb5419e48 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 28 May 2019 13:36:25 +0200 Subject: Remove PyNacl contraints in Features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 7a628f087403089d282cda14bcba858d8b0bc6c3) --- docker/tempest/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'docker/tempest/Dockerfile') diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 4d2500be9..9aeb7cb22 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -13,6 +13,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@$TEMPEST_TAG#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 && \ -- cgit 1.2.3-korg