aboutsummaryrefslogtreecommitdiffstats
path: root/functest_kubernetes/cnf_conformance
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-09-04 21:24:55 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-09-04 21:27:20 +0200
commit2cf6903c9a805b9c1b7702292bdf33b9485be319 (patch)
tree9f4f0397e341c747b1d7218761019353fb675ac9 /functest_kubernetes/cnf_conformance
parent120daffd8d6d4be727d2ba52a76dbd8eacfe2628 (diff)
Allow skipping arm and arm64 if cnf-conformance
cnf-conformance doesn't support this architectures. It also improve cleaning to publish artifacts [1]. [1] https://build.opnfv.org/ci/job/functest-kubernetes-opnfv-functest-kubernetes-cnf-latest-cnf_conformance-run/2/console Change-Id: Ie64e4a1b8b496a050a1798eaf4e5ef6397c011d0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest_kubernetes/cnf_conformance')
-rw-r--r--functest_kubernetes/cnf_conformance/conformance.py19
1 files changed, 16 insertions, 3 deletions
diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py
index 1f80f15c..5aff8aad 100644
--- a/functest_kubernetes/cnf_conformance/conformance.py
+++ b/functest_kubernetes/cnf_conformance/conformance.py
@@ -42,10 +42,19 @@ class CNFConformance(testcase.TestCase):
__logger = logging.getLogger(__name__)
+ def check_requirements(self):
+ """Check if cnf-conformance is in $PATH"""
+ if not os.path.exists(os.path.join(self.bin_dir, 'cnf-conformance')):
+ self.__logger.warning(
+ "cnf-conformance is not compiled for arm and arm64 for the "
+ "time being")
+ self.is_skipped = True
+
def setup(self):
"""Implement initialization and pre-reqs steps"""
- os.makedirs(self.res_dir, exist_ok=True)
-
+ if os.path.exists(self.res_dir):
+ shutil.rmtree(self.res_dir)
+ os.makedirs(self.res_dir)
shutil.copy2(os.path.join(self.src_dir, 'points.yml'), self.res_dir)
shutil.copy2(
os.path.join(self.src_dir, 'cnf-conformance.yml'), self.res_dir)
@@ -101,4 +110,8 @@ class CNFConformance(testcase.TestCase):
'cnf-config=cnf-conformance.yml']
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
- shutil.rmtree(self.res_dir)
+ shutil.rmtree(os.path.join(self.res_dir, 'tools'), ignore_errors=True)
+ shutil.rmtree(os.path.join(self.res_dir, 'cnfs'), ignore_errors=True)
+ for lfile in os.listdir(self.res_dir):
+ if not fnmatch.fnmatch(lfile, 'cnf-conformance-results-*.yml'):
+ os.remove(os.path.join(self.res_dir, lfile))