summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-04-14 01:00:55 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-04-14 11:04:18 +0200
commit88fe39f16edcb046df55830b9e2dc772bfc38ba7 (patch)
treef129d2779982a12fa1f7bb5eb487d8b40dfef969
parentfc771157b1102c1ad9858bf5bd24f231e19dc005 (diff)
Speed up lxml build
It allows cross-compiling it via travis-ci (benchmarking) [1][2] [1] https://lxml.de/installation.html [2] https://travis-ci.org/collivier/functest/jobs/519737041 Change-Id: I31609268d77405f036924a010cfb3dab520e9ea3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 1d190eb4039194d049cfc97b456978853d0d77d1)
-rw-r--r--.travis.yml8
-rw-r--r--docker/benchmarking/Dockerfile1
2 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index f52097e81..12a7fb632 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,6 +120,12 @@ jobs:
env:
- REPO="${DOCKER_USERNAME}"
- amd64_dirs=""
+ - arm64_dirs="docker/benchmarking"
+ - arm_dirs=""
+ - script: sudo -E bash build.sh
+ env:
+ - REPO="${DOCKER_USERNAME}"
+ - amd64_dirs=""
- arm64_dirs=""
- arm_dirs="docker/benchmarking"
- script: sudo -E bash build.sh
@@ -159,7 +165,7 @@ jobs:
--target ${DOCKER_USERNAME}/functest-smoke:hunter
- script: >
sudo manifest-tool push from-args \
- --platforms linux/amd64,linux/arm \
+ --platforms linux/amd64,linux/arm,linux/arm64 \
--template ${DOCKER_USERNAME}/functest-benchmarking:ARCH-hunter \
--target ${DOCKER_USERNAME}/functest-benchmarking:hunter
- script: >
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 110dcdcba..cf0fc36da 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -13,6 +13,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \
sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.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 && \
git init /src/vmtp && \
(cd /src/vmtp && \
git fetch --tags https://git.openstack.org/openstack/vmtp.git $VMTP_TAG && \