Revert "Upgrade cnf_testsuite to latest change"

v1.29 needs tarball releases so the previous change is delayed.

This reverts commit 32504996002da9fb8f6df3bda7fd808dea592a0e.

Change-Id: I6322ccc5206b6fac074bf922c5b6cd59a2f7b10d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 9ce5331..06a0d56 100644 (file)
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,7 +1,7 @@
 FROM opnfv/functest-kubernetes-core:v1.29
 
 ARG K8S_TAG=1.29
-ARG CNF_TESTSUITE_TAG=4bf8e73992eee555cb0b56f88729de9369d64064
+ARG CNF_TESTSUITE_TAG=v1.4.0
 ARG HELM_TAG=v3.6.0
 
 USER root

diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py
index bd98e0e..22cdbff 100644 (file)
--- a/functest_kubernetes/cnf_conformance/conformance.py
+++ b/functest_kubernetes/cnf_conformance/conformance.py
@@ -64,6 +64,26 @@ 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", "cnf-default", "litmus"]:
+            for item in api_response.items:
+                if item.metadata.name == namespace:
+                    self.corev1.patch_namespace(
+                        namespace,
+                        client.V1Namespace(metadata=client.V1ObjectMeta(
+                            labels={
+                                "pod-security.kubernetes.io/enforce":
+                                    "privileged"})))
+                    self.__logger.debug(
+                        "patch_namespace: %s", namespace)
+                    break
+            else:
+                self.corev1.create_namespace(
+                    client.V1Namespace(metadata=client.V1ObjectMeta(
+                        name=namespace, labels={
+                            "pod-security.kubernetes.io/enforce":
+                                "privileged"})))
+                self.__logger.debug(
+                    "create_namespace: %s", namespace)
         os.chdir(self.src_dir)
         cmd = ['cnf-testsuite', 'setup', '-l', 'debug']
         try:
@@ -135,13 +155,13 @@ class CNFConformance(testcase.TestCase):
         self.stop_time = time.time()
 
     def clean(self):
-        for clean_cmd in ['cnf_uninstall', 'uninstall_all']:
+        for clean_cmd in ['cnf_uninstall']:
             cmd = ['cnf-testsuite', clean_cmd,
                    'cnf-config=cnf-testsuite.yml']
             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", "cnf-default"]:
+            for namespace in ["cnf-testsuite", "cnf-default", "litmus"]:
                 self.corev1.delete_namespace(namespace)
                 self.__logger.debug("delete_namespace: %s", namespace)
         except client.rest.ApiException: