diff options
| -rw-r--r-- | docker/cnf/Dockerfile | 18 | ||||
| -rw-r--r-- | functest_kubernetes/cnf_conformance/conformance.py | 6 |
2 files changed, 17 insertions, 7 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 4d8d1d33..d6aa7b79 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,29 +1,33 @@ FROM opnfv/functest-kubernetes-core:jerma -ARG CNF_CONFORMANCE_TAG=v0.9.4 +ARG CNF_CONFORMANCE_TAG=v0.9.19 ARG HELM_TAG=v3.3.1 RUN apk --no-cache add --update wget curl libc6-compat && \ - K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-1.17.txt) && \ + K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-1.17.txt) && \ 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 && \ + --output /usr/local/bin/kubectl && \ curl https://get.helm.sh/helm-$HELM_TAG-linux-$ARCH.tar.gz \ - -s --output /src/helm-$HELM_TAG-linux-$ARCH.tar.gz && \ + --output /src/helm-$HELM_TAG-linux-$ARCH.tar.gz && \ tar zxf /src/helm-$HELM_TAG-linux-$ARCH.tar.gz linux-$ARCH/helm -C /src && \ mv /src/linux-$ARCH/helm /usr/local/bin && \ 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 \ - -Ls --output /src/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 -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/e636baff623dd934eadfce77891fc54da08a8134/example-cnfs/coredns/cnf-conformance.yml \ + 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 -Ls https://raw.githubusercontent.com/cncf/cnf-conformance/$CNF_CONFORMANCE_TAG/points.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 && \ + 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 && \ 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 diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py index 564f279d..3bb3170c 100644 --- a/functest_kubernetes/cnf_conformance/conformance.py +++ b/functest_kubernetes/cnf_conformance/conformance.py @@ -63,6 +63,12 @@ class CNFConformance(testcase.TestCase): shutil.copy2(os.path.join(self.src_dir, 'points.yml'), self.res_dir) shutil.copy2( os.path.join(self.src_dir, 'cnf-conformance.yml'), self.res_dir) + os.makedirs(os.path.join(self.res_dir, 'spec/fixtures')) + for cfile in ["chaos_network_loss.yml", "chaos_cpu_hog.yml", + "chaos_container_kill.yml"]: + shutil.copy2( + os.path.join(self.src_dir, 'spec/fixtures', cfile), + os.path.join(self.res_dir, 'spec/fixtures', cfile)) os.chdir(self.res_dir) cmd = ['cnf-conformance', 'setup'] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) |