diff options
| author |   Jingzhao Ni <jingzhao.ni@arm.com> | 2018-08-22 21:57:36 +0800 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-25 09:19:53 +0200 |
| commit | f9f15e3b3e4e4fc17dc4c7568e3c10e90aae87f6 (patch) | |
| tree | 755afcf2fdd0d1026c633722b7e8dad81e49ea2e | |
| parent | 25f68f484d550a9e54fd0b5d19524c024ac420ba (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>
(cherry picked from commit 6eeb84fbfa41fac996a19900fed5d9e49ce35d9f)
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index e19558c4..766c92fe 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) && \ |