summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingzhao Ni <jingzhao.ni@arm.com>2018-08-22 21:57:36 +0800
committerJingzhao Ni <jingzhao.ni@arm.com>2018-08-24 11:27:38 +0800
commit6eeb84fbfa41fac996a19900fed5d9e49ce35d9f (patch)
treea6184639120b44bd3d03c48cdac266fc83391e54
parent80c5b689bbaa330998c7c904ea5b095c704688bb (diff)
Fix issue of error image when running healthcheck case on arm platform
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>
-rw-r--r--docker/healthcheck/Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index ce3f82ba..cd18eafa 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -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) && \