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>
(cherry picked from commit a8482af79b22326d336fe58de00bb425892d46c6)

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index f4f62a6..f0906e3 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -23,9 +23,9 @@ 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 && \

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 64f81e0..9cfcfd4 100644 (file)
--- 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 && \