Add more LAVA fvp tests, fix regex and sanitise job timeouts
Add more FVP test jobs to increase code coverage
I had taken the old LAVA tests from MPS2 and as it is trying to match colour codes, it meant some different coloured tests were being missed. Remove the colour codes from the regex.
Shorten the MPS2 job timeouts as the jobs are much shorter, and increase the FVP timeouts as some of the regression tests take a bit longer than expected.
Change-Id: I528a261593ee5b15019b8ee44269cf3ce07e1177
diff --git a/tfm_ci_pylib/lava_rpc_connector.py b/tfm_ci_pylib/lava_rpc_connector.py
index 5db23b1..a0255d8 100644
--- a/tfm_ci_pylib/lava_rpc_connector.py
+++ b/tfm_ci_pylib/lava_rpc_connector.py
@@ -118,11 +118,14 @@
return job_info
def get_error_reason(self, job_id):
- lava_res = self.results.get_testsuite_results_yaml(job_id, 'lava')
- results = yaml.load(lava_res)
- for test in results:
- if test['name'] == 'job':
- return(test.get('metadata', {}).get('error_type', ''))
+ try:
+ lava_res = self.results.get_testsuite_results_yaml(job_id, 'lava')
+ results = yaml.load(lava_res)
+ for test in results:
+ if test['name'] == 'job':
+ return(test.get('metadata', {}).get('error_type', ''))
+ except Exception:
+ return("Unknown")
def get_job_state(self, job_id):
return self.scheduler.job_state(job_id)["job_state"]