diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-28 13:36:25 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-28 15:38:26 +0200 |
| commit | 723306a2c0401539ea08a6d700ee9457e0834c0b (patch) | |
| tree | 6398a336a9aebf6a9fb73029d25198500e18629f /docker/vnf/Dockerfile | |
| parent | bcfc6d6cde658a6171d6bcb62fdcd15abd05e9a4 (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>
(cherry picked from commit 7a628f087403089d282cda14bcba858d8b0bc6c3)
Diffstat (limited to 'docker/vnf/Dockerfile')
| -rw-r--r-- | docker/vnf/Dockerfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index ad6bd84db..67adc89bc 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -26,6 +26,7 @@ RUN apk --no-cache add --update \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ make && \ 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 && \ + 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 clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \ |