aboutsummaryrefslogtreecommitdiffstats
path: root/docker/benchmarking
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-05-12 20:19:14 +0200
committerCédric Ollivier <ollivier.cedric@gmail.com>2019-05-28 10:35:15 +0200
commit3f8d791535f7306b05c47415fa7809e73f6d93e9 (patch)
tree52bda02674fc1a861c35c66421a91f4700a10b6d /docker/benchmarking
parent01d6c209e81e0b954e58811167285ab264de079c (diff)
Install PyNaCl via package
Building functest-core container sometimes reaches travis-ci timeout [0]. It currently selects the right version in master and stable/hunter. [0] https://travis-ci.org/collivier/functest/jobs/531417730 Change-Id: Ie6c8e729f76c98c6f8c8e9ca01b2c998081f7ce8 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 6aad708727e41eaa8f61a104323386568a163dd3)
Diffstat (limited to 'docker/benchmarking')
-rw-r--r--docker/benchmarking/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 349ab5fef..48103dbf3 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -13,7 +13,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
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 && \
- CFLAGS="-O0" pip install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml && \
+ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" pip install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml ;; esac && \
git init /src/vmtp && \
(cd /src/vmtp && \
git fetch --tags https://opendev.org/x/vmtp.git $VMTP_TAG && \