aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-06-15 08:41:42 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-06-15 08:41:42 +0200
commita8482af79b22326d336fe58de00bb425892d46c6 (patch)
tree189b00d7e2150eada5e4a1226ebc8e1e636856f2
parent961b940c796871e40146b90cf19b48390310dd59 (diff)
Compile lxml with optimization in smoke
Else cross compilation raises travis-ci.org's timeouts [1] [1] https://travis-ci.org/github/collivier/functest/jobs/698227192 Change-Id: I985321ac68a7a94cb8483d831f03222d44b3be57 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile3
-rw-r--r--docker/smoke/Dockerfile3
2 files changed, 5 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 27e2fe1d2..383d4a0c9 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -18,15 +18,16 @@ RUN apk --no-cache add --update \
(cd /src/functest && \
git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \
git checkout FETCH_HEAD) && \
+ sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \
sed -i -E /#egg=functest/d /src/functest/upper-constraints.txt && \
- sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \
pip3 install --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \
-e /src/requirements && \
update-requirements -s --source /src/requirements /src/functest && \
pip3 install --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \
-e /src/functest && \
(cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \
+ sed -i -E /#egg=rally/d /src/functest/upper-constraints.txt && \
rm -r /src/requirements/.git /src/functest/.git \
/tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \
cp /src/functest/functest/ci/logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/ && \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 927d78255..d49fbb9a1 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -15,6 +15,9 @@ RUN apk --no-cache add --update libxml2 libxslt && \
apk --no-cache add --virtual .build-deps --update \
python3-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
+ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \
+ pip3 install --no-cache-dir -c/src/requirements/upper-constraints.txt \
+ -c/src/functest/upper-constraints.txt lxml ;; esac && \
git init /src/patrole && \
(cd /src/patrole && \
git fetch --tags https://opendev.org/openstack/patrole.git $PATROLE_TAG && \