diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-08-25 07:16:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-25 07:16:35 +0000 |
| commit | 8df34f03168cad4b1b1ef9b53f08cbe76d4e8ed1 (patch) | |
| tree | a5a3540b1d77fd13d84f6cbdbf47163be37736d2 | |
| parent | 80507681b22a66d412fa7c944d190867b20fa667 (diff) | |
| parent | 6eeb84fbfa41fac996a19900fed5d9e49ce35d9f (diff) | |
Merge "Fix issue of error image when running healthcheck case on arm platform"
| -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 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) && \ |