Upgrade CNF TestSuite to v1.3.3

Change-Id: I3ee3d1b49fc9efded0b3edc00a8ba67b5cc63bca
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit c8394e99a2e6564e137dab1961d26efed9d5ac87)

diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 6d7673f..289fa15 100644 (file)
--- 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 b578ce2..41ce05c 100644 (file)
--- 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)