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 12:58:12 +0200 |
| commit | 7f8cef089138308cc96e15314a85f3684eedc7de (patch) | |
| tree | f636b63486d810b6bcc6d94e40576d3b44db8121 | |
| parent | 2642d87ab9734e5b6d95f451fd1d902e18750e2a (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>
(cherry picked from commit 6801612e85c485e9885cfb41cbc84771475a134f)
| -rw-r--r-- | .travis.yml | 28 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 27 |
2 files changed, 37 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 57fc2d22..4ebc44b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,18 @@ jobs: - script: bash build.sh env: - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm_dirs="docker/healthcheck" + - arm64_dirs="" + - script: bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm_dirs="" + - arm64_dirs="docker/healthcheck" + - script: bash build.sh + env: + - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/cnf" - arm_dirs="" - arm64_dirs="" @@ -94,7 +106,7 @@ jobs: - stage: publish functest-kubernetes-[healthcheck,cnf,security] manifests script: > manifest-tool push from-args \ - --platforms linux/amd64 \ + --platforms linux/amd64,linux/arm,linux/arm64 \ --template \ ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-jerma \ --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:jerma @@ -116,9 +128,21 @@ jobs: - amd64_dirs="docker/smoke" - arm_dirs="" - arm64_dirs="" + - script: bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm_dirs="docker/smoke" + - arm64_dirs="" + - script: bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm_dirs="" + - arm64_dirs="docker/smoke" - stage: publish functest-kubernetes-smoke manifests script: > manifest-tool push from-args \ - --platforms linux/amd64 \ + --platforms linux/amd64,linux/arm,linux/arm64 \ --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-jerma \ --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:jerma diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index e621f011..cb1614ff 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,20 +1,15 @@ FROM opnfv/functest-kubernetes-core:jerma -ARG K8S_TAG=v1.17.11 - -RUN apk --no-cache add --update make bash git \ - grep rsync linux-headers musl-dev findutils \ - libffi openssl libjpeg-turbo && \ - apk --no-cache add --virtual .build-deps --update \ - gcc python3-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ - git init /src/k8s.io/kubernetes && \ - (cd /src/k8s.io/kubernetes && \ - git fetch --tags https://github.com/kubernetes/kubernetes $K8S_TAG && \ - git checkout FETCH_HEAD && \ - make kubectl ginkgo && \ - make WHAT=test/e2e/e2e.test && \ - mv _output/bin/* /usr/local/bin) && \ - rm -r /src/k8s.io && \ - apk del .build-deps +RUN apk --no-cache add --update curl libc6-compat && \ + K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-1.17.txt) && \ + case $(uname -m) in armv7l) ARCH=arm;; aarch64) ARCH=arm;; x86_64) ARCH=amd64;; esac && \ + curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/bin/linux/$ARCH/kubectl \ + -s --output /usr/local/bin/kubectl && \ + curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/kubernetes-test-linux-$ARCH.tar.gz \ + -s --output /src/kubernetes-test-linux-$ARCH.tar.gz && \ + tar zxf /src/kubernetes-test-linux-$ARCH.tar.gz kubernetes/test/bin/e2e.test kubernetes/test/bin/ginkgo -C /src && \ + mv /src/kubernetes/test/bin/e2e.test /src/kubernetes/test/bin/ginkgo /usr/local/bin/ && \ + chmod +x /usr/local/bin/kubectl /usr/local/bin/e2e.test /usr/local/bin/ginkgo && \ + rm -r /src/kubernetes /src/kubernetes-test-linux-$ARCH.tar.gz COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |