diff options
| -rw-r--r-- | docker/cnf/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/cnf/testcases.yaml | 5 | ||||
| -rw-r--r-- | functest_kubernetes/cnf_conformance/conformance.py | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index e495a701..c8d24b7a 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -26,9 +26,7 @@ RUN apk --no-cache add --update wget curl ncurses git yaml openssl zlib && \ (cd /src/cnf-testsuite && \ git fetch --tags https://github.com/cnti-testcatalog/testsuite.git $CNF_TESTSUITE_TAG && \ git checkout FETCH_HEAD && \ - wget https://patch-diff.githubusercontent.com/raw/cnti-testcatalog/testsuite/pull/2156.diff && \ - patch -p1 < 2156.diff && rm 2156.diff && \ - shards install && \ + shards install --without-development && \ crystal build --static src/cnf-testsuite.cr && \ cp cnf-testsuite /usr/local/bin/cnf-testsuite && rm -r lib) && \ chown -R xtesting: /src/cnf-testsuite && \ diff --git a/docker/cnf/testcases.yaml b/docker/cnf/testcases.yaml index 30b6b664..edaa8143 100644 --- a/docker/cnf/testcases.yaml +++ b/docker/cnf/testcases.yaml @@ -30,13 +30,12 @@ tiers: - case_name: cnf_testsuite project_name: functest - # https://github.com/cncf/cnf-certification/blob/main/reviewing.md - criteria: 10 + criteria: 15 blocking: false description: >- Enable interoperability of Cloud native Network Functions (CNFs) as proposed by - https://github.com/cncf/cnf-testsuite + https://github.com/cnti-testcatalog/testsuite dependencies: - DEPLOY_SCENARIO: "k8-*" run: diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py index 41ce05c8..d1e4bcf1 100644 --- a/functest_kubernetes/cnf_conformance/conformance.py +++ b/functest_kubernetes/cnf_conformance/conformance.py @@ -64,7 +64,7 @@ class CNFConformance(testcase.TestCase): if os.path.exists(os.path.join(self.src_dir, "results")): shutil.rmtree(os.path.join(self.src_dir, "results")) api_response = self.corev1.list_namespace() - for namespace in ["cnf-testsuite", "default", "litmus"]: + for namespace in ["cnf-testsuite", "cnf-default", "litmus"]: for item in api_response.items: if item.metadata.name == namespace: self.corev1.patch_namespace( @@ -161,7 +161,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")) try: - for namespace in ["cnf-testsuite", "litmus"]: + for namespace in ["cnf-testsuite", "cnf-default", "litmus"]: self.corev1.delete_namespace(namespace) self.__logger.debug("delete_namespace: %s", namespace) except client.rest.ApiException: |