From f7bb307634e15022874db7d50bc37bf6dea62bea Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 23 Sep 2024 14:43:15 +0200 Subject: [PATCH] Upgrade CNF TestSuite to v1.3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I3ee3d1b49fc9efded0b3edc00a8ba67b5cc63bca Signed-off-by: Cédric Ollivier (cherry picked from commit c8394e99a2e6564e137dab1961d26efed9d5ac87) --- docker/cnf/Dockerfile | 2 +- functest_kubernetes/cnf_conformance/conformance.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile index 6d7673fd..289fa15e 100644 --- a/docker/cnf/Dockerfile +++ b/docker/cnf/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-kubernetes-core:v1.28 ARG K8S_TAG=1.28 -ARG CNF_TESTSUITE_TAG=v1.0.0 +ARG CNF_TESTSUITE_TAG=v1.3.3 ARG HELM_TAG=v3.3.1 USER root diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py index b578ce22..41ce05c8 100644 --- a/functest_kubernetes/cnf_conformance/conformance.py +++ b/functest_kubernetes/cnf_conformance/conformance.py @@ -72,7 +72,7 @@ class CNFConformance(testcase.TestCase): client.V1Namespace(metadata=client.V1ObjectMeta( labels={ "pod-security.kubernetes.io/enforce": - "baseline"}))) + "privileged"}))) self.__logger.debug( "patch_namespace: %s", namespace) break @@ -81,7 +81,7 @@ class CNFConformance(testcase.TestCase): client.V1Namespace(metadata=client.V1ObjectMeta( name=namespace, labels={ "pod-security.kubernetes.io/enforce": - "baseline"}))) + "privileged"}))) self.__logger.debug( "create_namespace: %s", namespace) os.chdir(self.src_dir) @@ -155,8 +155,7 @@ class CNFConformance(testcase.TestCase): self.stop_time = time.time() def clean(self): - for clean_cmd in ['uninstall_falco', - 'cnf_cleanup']: + for clean_cmd in ['cnf_cleanup']: cmd = ['cnf-testsuite', clean_cmd, 'cnf-config=cnf-testsuite.yml'] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) -- 2.16.6