aboutsummaryrefslogtreecommitdiffstats
path: root/docker/cnf
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-09-04 21:24:55 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-09-04 21:27:20 +0200
commit2cf6903c9a805b9c1b7702292bdf33b9485be319 (patch)
tree9f4f0397e341c747b1d7218761019353fb675ac9 /docker/cnf
parent120daffd8d6d4be727d2ba52a76dbd8eacfe2628 (diff)
Allow skipping arm and arm64 if cnf-conformance
cnf-conformance doesn't support this architectures. It also improve cleaning to publish artifacts [1]. [1] https://build.opnfv.org/ci/job/functest-kubernetes-opnfv-functest-kubernetes-cnf-latest-cnf_conformance-run/2/console Change-Id: Ie64e4a1b8b496a050a1798eaf4e5ef6397c011d0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/cnf')
-rw-r--r--docker/cnf/Dockerfile8
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 2a1dac24..dff16456 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -7,9 +7,11 @@ RUN apk --no-cache add --update wget curl libc6-compat && \
case $(uname -m) in armv7l) ARCH=arm;; aarch64) ARCH=arm64;; x86_64) ARCH=amd64;; esac && \
curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/bin/linux/$ARCH/kubectl \
-s --output /usr/local/bin/kubectl && \
- curl https://github.com/cncf/cnf-conformance/releases/download/$CNF_CONFORMANCE_TAG/cnf-conformance-$(echo $CNF_CONFORMANCE_TAG |cut -d\- -f 1)-$ARCH-static \
- -Ls --output /usr/local/bin/cnf-conformance && \
- chmod +x /usr/local/bin/kubectl /usr/local/bin/cnf-conformance && \
+ case $(uname -m) in x86_64) \
+ curl https://github.com/cncf/cnf-conformance/releases/download/$CNF_CONFORMANCE_TAG/cnf-conformance-$(echo $CNF_CONFORMANCE_TAG |cut -d\- -f 1)-$ARCH-static \
+ -Ls --output /usr/local/bin/cnf-conformance && \
+ chmod +x /usr/local/bin/cnf-conformance ;; esac && \
+ chmod +x /usr/local/bin/kubectl && \
mkdir -p /src/cnf-conformance && \
curl -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/example-cnfs/coredns/cnf-conformance.yml \
-s --output /src/cnf-conformance/cnf-conformance.yml && \