diff options
author | 2019-05-28 13:36:25 +0200 | |
---|---|---|
committer | 2019-05-28 15:54:23 +0200 | |
commit | 9d47f817762c03e2b34e8f847f2616ffb5419e48 (patch) | |
tree | a0ccbc8cd3e914fd7f12dccc23e27457a91eb0d9 /docker | |
parent | ba0478fb5497dc389aaf8742f8b7a4f03a8f866e (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')
-rw-r--r-- | docker/benchmarking/Dockerfile | 1 | ||||
-rw-r--r-- | docker/core/Dockerfile | 2 | ||||
-rw-r--r-- | docker/features/Dockerfile | 1 | ||||
-rw-r--r-- | docker/healthcheck/Dockerfile | 1 | ||||
-rw-r--r-- | docker/smoke/Dockerfile | 1 | ||||
-rw-r--r-- | docker/tempest/Dockerfile | 1 | ||||
-rw-r--r-- | docker/vnf/Dockerfile | 1 |
7 files changed, 7 insertions, 1 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 48103dbf3..53c3ad899 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -11,6 +11,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ 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 && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" pip install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml ;; esac && \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index cfb503e59..b50f5096b 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -10,7 +10,7 @@ RUN apk --no-cache add --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ - case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt && apk add py-pynacl ;; esac && \ + case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt && apk add --no-cache py-pynacl ;; 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 && \ pip install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 1ae8db1c9..c413d9846 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -11,6 +11,7 @@ RUN apk --no-cache add --update python3 sshpass && \ openssl-dev libjpeg-turbo-dev file && \ 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 && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index accd18963..d267089ca 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -9,6 +9,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev openssl-dev && \ 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 && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index b386bd25b..9afe54957 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -13,6 +13,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ 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 init /src/patrole && \ diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 4d2500be9..9aeb7cb22 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -13,6 +13,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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 && \ sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ 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 init /src/rally && \ diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index de1baf312..44da1e6fa 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 && \ |