diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-09-04 21:24:55 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-09-04 22:42:34 +0200 |
| commit | 0880403ddcb8a4a642c4ecdf62cffdbbd02c1883 (patch) | |
| tree | 7691d4403236233bb0a5f5e9c1b501242d4bf93c /docker | |
| parent | e4d1b936f5e5de34adf1a59a4e7ae7ea48e64cf3 (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>
(cherry picked from commit 2cf6903c9a805b9c1b7702292bdf33b9485be319)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cnf/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 0100593a..22ac558c 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 && \ |