diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-14 13:58:13 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-16 11:49:27 +0200 |
| commit | 6801612e85c485e9885cfb41cbc84771475a134f (patch) | |
| tree | d6beca1c13613e70954f7477d5202173f4d1cc12 /docker/core | |
| parent | f725a84c94ef6fc77a37ba5c6df3086270726c6e (diff) | |
Stop compiling K8s testing binaries
It reaches Travis CI timeouts and is quite useless.
PyNaCl is now installed via Alpine packages to save CI.
Change-Id: Ifdf3f46f162a811ed95e3ca07ea7c3d89bc77a91
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core')
| -rw-r--r-- | docker/core/Dockerfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 250d4685..6cddfcb7 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -9,12 +9,15 @@ COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.T RUN apk --no-cache add --update python3 py3-pip py3-wheel bash git grep libffi openssl mailcap && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base libffi-dev openssl-dev && \ - apk --no-cache add --update py3-distlib==0.3.1-r0 \ - --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \ git init /src/requirements && \ (cd /src/requirements && \ git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \ git checkout FETCH_HEAD) && \ + case $(uname -m) in aarch*|arm*) \ + sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && \ + apk add --no-cache py3-pynacl ;; esac && \ + apk --no-cache add --update py3-distlib\>=0.3.1 \ + --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \ git init /src/functest-kubernetes && \ (cd /src/functest-kubernetes && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \ |