X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fhealthcheck%2FDockerfile;h=24ea959dc7b5728d9f5a319ea3b7088d12eeca7f;hb=refs%2Fchanges%2F01%2F70501%2F1;hp=cd18eafa52d37b0e3d4287baebb529d38e5ec8c1;hpb=8df34f03168cad4b1b1ef9b53f08cbe76d4e8ed1;p=functest-kubernetes.git diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index cd18eafa..24ea959d 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,19 +1,20 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:hunter -ARG K8S_TAG=v1.9.4 +ARG K8S_TAG=v1.13.12 -RUN apk --no-cache add --update make py-pip bash git go \ +RUN apk --no-cache add --update make py-pip bash git \ grep rsync linux-headers musl-dev findutils \ - libffi libssl1.0 libjpeg-turbo && \ + libffi openssl libjpeg-turbo && \ apk --no-cache add --virtual .build-deps --update \ - python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ - git clone https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes && \ - (cd /src/k8s.io/kubernetes && git checkout $K8S_TAG && \ - # 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 && \ + gcc 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 && \ make kubectl ginkgo && \ make WHAT=test/e2e/e2e.test && \ - mv _output/bin/kubectl /usr/local/bin) && \ + 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 CMD ["run_tests", "-t", "all"]