Fix issue of error image when running healthcheck case on arm platform 73/61373/2
authorJingzhao Ni <jingzhao.ni@arm.com>
Wed, 22 Aug 2018 13:57:36 +0000 (21:57 +0800)
committerCédric Ollivier <cedric.ollivier@orange.com>
Sat, 25 Aug 2018 07:19:53 +0000 (09:19 +0200)
Replace the "amd64" with "arm64" in the pod.yaml when building
the healthcheck images.

Change-Id: I58b2d91ce1c74575becb77eee4c711623becd0fe
Signed-off-by: Jingzhao Ni <jingzhao.ni@arm.com>
(cherry picked from commit 6eeb84fbfa41fac996a19900fed5d9e49ce35d9f)

docker/healthcheck/Dockerfile

index e19558c..766c92f 100644 (file)
@@ -9,6 +9,8 @@ RUN apk --no-cache add --update make py-pip bash git go \
         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 && \
         make kubectl ginkgo && \
         make WHAT=test/e2e/e2e.test && \
         mv _output/bin/kubectl /usr/local/bin) && \