aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-10-10 13:15:43 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2022-10-10 13:26:13 +0200
commit0f7bdba5e72cae958ff6abe7710b086ed3aa061a (patch)
treed360f45f6c69090dc282174f8645ce3a1a59d9e2
parent4c2151e94b0d92855ad00c8fc6a48555a5d516cf (diff)
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> (cherry picked from commit 334cdea22b2c47c75523399ed3ebfa08f105e57c)
-rw-r--r--functest_kubernetes/cnf_conformance/conformance.py10
1 files changed, 6 insertions, 4 deletions
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"))