From 2cf6903c9a805b9c1b7702292bdf33b9485be319 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 4 Sep 2020 21:24:55 +0200 Subject: Allow skipping arm and arm64 if cnf-conformance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/cnf/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docker/cnf') 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 && \ -- cgit 1.2.3-korg