From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 10 Oct 2022 11:15:43 +0000 (+0200)
Subject: Uninstall falco and cri_tools after testing
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d07e2de81761e72bb8085a7d46f4f0424833d846;p=functest-kubernetes.git

Uninstall falco and cri_tools after testing

Functest runs several clusters in the same server.
It quickly failes if falco is still running (dkms
tries to unload the module which is in-use).

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

diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py
index 2cf4baa9..e3e3fe0d 100644
--- a/functest_kubernetes/cnf_conformance/conformance.py
+++ b/functest_kubernetes/cnf_conformance/conformance.py
@@ -118,7 +118,9 @@ class CNFConformance(testcase.TestCase):
         self.stop_time = time.time()
 
     def clean(self):
-        cmd = ['cnf-testsuite', 'cnf_cleanup',
-               '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"))
+        for clean_cmd in ['uninstall_cri_tools', 'uninstall_falco',
+                          'cnf_cleanup']:
+            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"))