X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fhealthcheck%2FDockerfile;h=13ffe4494f0e98d9dd86af97a64415cc3630ae9b;hb=b1e22e37cc436451b3519a0ef7f9704b5a86f9cc;hp=344ea7ff66134e788e0e2c0254de1e39f8061c22;hpb=ca3c9cf6f57c87aee8c6f0b93f70d84e3df736de;p=functest-kubernetes.git

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 344ea7ff..13ffe449 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,23 +1,17 @@
 FROM opnfv/functest-kubernetes-core
 
-ARG K8S_TAG=v1.11.2
-
-RUN apk --no-cache add --update make py-pip bash git \
-        grep rsync linux-headers musl-dev findutils \
-        libffi libssl1.0 libjpeg-turbo && \
-    apk --no-cache add 'go>1.10.2' --repository http://dl-cdn.alpinelinux.org/alpine/edge/community && \
-    apk --no-cache add --virtual .build-deps --update \
-        python-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 && \
-        # Replace the amd64 with arm64 when building e2e.test on arm platform.
-        if [ "$(uname -m)" = "aarch64" ]; then sed -i "s/amd64/arm64/g" ./test/images/clusterapi-tester/pod.yaml ; fi && \
-        make kubectl ginkgo && \
-        make WHAT=test/e2e/e2e.test && \
-        mv _output/bin/* /usr/local/bin) && \
-    rm -r /src/k8s.io && \
-    apk del .build-deps
-COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
+USER root
+RUN apk --no-cache add --update curl libc6-compat && \
+    tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest.txt)  && \
+    case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \
+    curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \
+        -s --output /usr/local/bin/kubectl && \
+    curl https://storage.googleapis.com/kubernetes-release/release/$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
+USER xtesting
+COPY testcases.yaml /etc/xtesting/testcases.yaml
 CMD ["run_tests", "-t", "all"]