diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-05-03 16:03:08 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-05-03 16:05:05 +0200 |
| commit | a025fb0ac12cd86ad4fb6dd05867fb273cdbb652 (patch) | |
| tree | 296d1fab958b59d8dd54d2aae23dd3c864b38d2b | |
| parent | 959da00d3e1c4d406bc59995c0ea93add1ec48d3 (diff) | |
Fix cnf-conformance results filename
It also decreases criteria to 1 due to massive changes (dockerd).
Change-Id: Ic420139e6355debae183a77d6b0c574801b05076
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/cnf/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/cnf/testcases.yaml | 2 | ||||
| -rw-r--r-- | functest_kubernetes/cnf_conformance/conformance.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index b27b9846..bbb52c50 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -4,7 +4,7 @@ ARG K8S_TAG=1.22 ARG CNF_TESTSUITE_TAG=v0.11.0 ARG HELM_TAG=v3.3.1 -RUN apk --no-cache add --update wget curl libc6-compat && \ +RUN apk --no-cache add --update wget curl libc6-compat ncurses && \ tag=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-$K8S_TAG.txt) && \ case $(uname -m) in armv7l) arch=arm;; aarch64) arch=arm64;; x86_64) arch=amd64;; esac && \ curl https://storage.googleapis.com/kubernetes-release/release/$tag/bin/linux/$arch/kubectl \ diff --git a/docker/cnf/testcases.yaml b/docker/cnf/testcases.yaml index 98e9a197..cc28ca1b 100644 --- a/docker/cnf/testcases.yaml +++ b/docker/cnf/testcases.yaml @@ -30,7 +30,7 @@ tiers: - case_name: cnf_testsuite project_name: functest - criteria: 90 + criteria: 1 blocking: false description: >- Enable interoperability of Cloud native Network diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py index 1ef42adc..be5fca8c 100644 --- a/functest_kubernetes/cnf_conformance/conformance.py +++ b/functest_kubernetes/cnf_conformance/conformance.py @@ -84,7 +84,7 @@ class CNFConformance(testcase.TestCase): output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8")) lfiles = glob.glob(os.path.join( - self.res_dir, 'results', 'cnf-testsuite-results-*.yml')) + self.res_dir, 'results', 'cnf-conformance-results-*.yml')) results = max(lfiles, key=os.path.getmtime) with open(os.path.join(self.res_dir, 'results', results)) as yfile: self.details = yaml.safe_load(yfile) |