From bf887a2aab5a7d5f0dfab1aac4ef9d54b8c1d17c Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 21 Nov 2020 13:06:25 +0100 Subject: Update cnf_conformance to v0.9.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It removes all hacks bypassing a few former bugs (e.g. [1]) and adapts to the new cnf-conformance result output logic. It runs all workload tests as it's now proposed (k8s conformance is already part of smoke) and select the latest coredns cnf-conformance.yml taking latest helm repo changes into account. It sets criteria 95 as all steps are considered as passed and a overall result 100/105. [1] https://github.com/cncf/cnf-conformance/issues/388 Change-Id: I95b7889b21b86961e7a1d0c84b13e0ae367cae44 Signed-off-by: Cédric Ollivier (cherry picked from commit 854f164998793000fcf8019214b259b7283f5194) --- docker/cnf/Dockerfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'docker/cnf/Dockerfile') diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index f7a8ef3b..4d8d1d33 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,6 +1,6 @@ FROM opnfv/functest-kubernetes-core:jerma -ARG CNF_CONFORMANCE_TAG=v0.7.2-beta1 +ARG CNF_CONFORMANCE_TAG=v0.9.4 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ @@ -15,13 +15,16 @@ RUN apk --no-cache add --update wget curl libc6-compat && \ chmod +x /usr/local/bin/kubectl /usr/local/bin/helm && \ rm -r /src/helm-$HELM_TAG-linux-$ARCH.tar.gz /src/linux-$ARCH && \ 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 && \ - 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 && \ - curl -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/points.yml \ - -s --output /src/cnf-conformance/points.yml + curl https://github.com/cncf/cnf-conformance/releases/download/$CNF_CONFORMANCE_TAG/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz \ + -Ls --output /src/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz && \ + tar zxf /src/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz ./cnf-conformance -C /usr/local/bin && \ + chmod +x /usr/local/bin/cnf-conformance && \ + mkdir /src/cnf-conformance && \ + curl -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/e636baff623dd934eadfce77891fc54da08a8134/example-cnfs/coredns/cnf-conformance.yml \ + --output /src/cnf-conformance/cnf-conformance.yml && \ + curl -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/points.yml \ + --output /src/cnf-conformance/points.yml && \ + helm repo add stable https://cncf.gitlab.io/stable && \ + rm /src/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz ;; esac COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] -- cgit 1.2.3-korg