aboutsummaryrefslogtreecommitdiffstats
path: root/docker/healthcheck
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-08-14 13:58:13 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-08-16 12:59:37 +0200
commit88b12b70dc56b714e6c6a6d08c4e373d8cafd00b (patch)
tree73f2ed901b21040397b1d41aff579735038081c2 /docker/healthcheck
parent1f46a9cecb79c47c2f5f10825a9b2c8c920bf1c2 (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)
Diffstat (limited to 'docker/healthcheck')
-rw-r--r--docker/healthcheck/Dockerfile27
1 files changed, 11 insertions, 16 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 9ba86f0c..b9792f93 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,20 +1,15 @@
FROM opnfv/functest-kubernetes-core:iruya
-ARG K8S_TAG=v1.15.12
-
-RUN apk --no-cache add --update make py3-pip 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.15.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.6/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]