From 0f7bdba5e72cae958ff6abe7710b086ed3aa061a Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 10 Oct 2022 13:15:43 +0200 Subject: Uninstall falco and cri_tools after testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 334cdea22b2c47c75523399ed3ebfa08f105e57c) --- functest_kubernetes/cnf_conformance/conformance.py | 10 ++++++---- 1 file 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")) -- cgit 1.2.3-korg