From 959da00d3e1c4d406bc59995c0ea93add1ec48d3 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 3 May 2021 09:32:59 +0200 Subject: Update cnf-conformance to cnf-testsuite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/cncf/cnf-conformance https://github.com/cncf/cnf-testsuite Change-Id: I77983e0f04781a92b34afcf82f21366384782964 Signed-off-by: Cédric Ollivier --- docker/cnf/Dockerfile | 28 ++++++++++++++-------------- docker/cnf/testcases.yaml | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'docker/cnf') diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 9d37db9b..b27b9846 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-kubernetes-core ARG K8S_TAG=1.22 -ARG CNF_CONFORMANCE_TAG=v0.9.19 +ARG CNF_TESTSUITE_TAG=v0.11.0 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ @@ -16,20 +16,20 @@ 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-$CNF_CONFORMANCE_TAG.tar.gz \ - -L --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 -L https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/example-cnfs/coredns/cnf-conformance.yml \ - --output /src/cnf-conformance/cnf-conformance.yml && \ - curl -L https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/points.yml \ - --output /src/cnf-conformance/points.yml && \ - mkdir -p /src/cnf-conformance/spec/fixtures && \ + curl https://github.com/cncf/cnf-testsuite/releases/download/$CNF_TESTSUITE_TAG/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz \ + -L --output /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz && \ + tar zxf /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz ./cnf-testsuite -C /usr/local/bin && \ + chmod +x /usr/local/bin/cnf-testsuite && \ + mkdir /src/cnf-testsuite && \ + curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/example-cnfs/coredns/cnf-conformance.yml \ + --output /src/cnf-testsuite/cnf-conformance.yml && \ + curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/points.yml \ + --output /src/cnf-testsuite/points.yml && \ + mkdir -p /src/cnf-testsuite/spec/fixtures && \ for yml in chaos_network_loss.yml chaos_cpu_hog.yml chaos_container_kill.yml; do \ - curl -L https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/spec/fixtures/$yml \ - --output /src/cnf-conformance/spec/fixtures/$yml; done && \ + curl -L https://raw.githubusercontent.com/cncf/cnf-testsuite/$CNF_TESTSUITE_TAG/spec/fixtures/$yml \ + --output /src/cnf-testsuite/spec/fixtures/$yml; done && \ helm repo add stable https://cncf.gitlab.io/stable && \ - rm /src/cnf-conformance-$CNF_CONFORMANCE_TAG.tar.gz ;; esac + rm /src/cnf-testsuite-$CNF_TESTSUITE_TAG.tar.gz ;; esac COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/cnf/testcases.yaml b/docker/cnf/testcases.yaml index 287747dc..98e9a197 100644 --- a/docker/cnf/testcases.yaml +++ b/docker/cnf/testcases.yaml @@ -28,15 +28,15 @@ tiers: run: name: helm_vims - - case_name: cnf_conformance + - case_name: cnf_testsuite project_name: functest criteria: 90 blocking: false description: >- Enable interoperability of Cloud native Network Functions (CNFs) as proposed by - https://github.com/cncf/cnf-conformance + https://github.com/cncf/cnf-testsuite dependencies: - DEPLOY_SCENARIO: "k8-*" run: - name: cnf_conformance + name: cnf_testsuite -- cgit 1.2.3-korg