lava_helper: Further increased timeouts
This patch is aimed at increasing stability at
the test farm. It introduces the following changes:
* Power-off timeots have been increased to 5 minutes.
* Overall job execution time-out has been increased
by 60 minutes.
* Monitor matching has been moved to the start
of the line that regex is parsing.
Change-Id: If3bcb8a944ca08e941e1b6007ca759b15b1f67de
Signed-off-by: Minos Galanakis <minos.galanakis@linaro.org>
diff --git a/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2 b/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2
index b80884c..3fdf519 100644
--- a/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2
+++ b/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2
@@ -14,7 +14,7 @@
minutes: {{ action_timeout }}
actions:
power-off:
- seconds: {{ poweroff_timeout }}
+ minutes: {{ poweroff_timeout }}
connections:
lava-test-monitor:
minutes: {{ monitor_timeout }}
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 73bdc89..4ac2222 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -49,10 +49,10 @@
"templ": "template_tfm_mps2_sse_200.jinja2",
"job_name": "mps2plus-arm-tfm",
"device_type": "mps",
- "job_timeout": 120,
+ "job_timeout": 180,
"action_timeout": 90,
"monitor_timeout": 90,
- "poweroff_timeout": 50,
+ "poweroff_timeout": 5,
"recovery_store_url": "%(jenkins_url)s/"
"job/%(jenkins_job)s",
"artifact_store_url": "%(jenkins_url)s/"
@@ -70,7 +70,7 @@
"monitors": [
{
'name': 'Secure_Test_Suites_Summary',
- 'start': 'Jumping to the first image slot',
+ 'start': '[Sec Thread]',
'end': '\\x1b\\\[0m',
'pattern': r'\x1b\\[1;34m\\[Sec Thread\\] '
r'(?P<test_case_id>Secure image '
@@ -144,7 +144,7 @@
"monitors": [
{
'name': 'Secure_Test_Suites_Summary',
- 'start': 'Jumping to the first image slot',
+ 'start': '[Sec Thread]',
'end': '\\x1b\\\[0m',
'pattern': r'\x1b\\[1;34m\\[Sec Thread\\] '
r'(?P<test_case_id>Secure image '
@@ -162,7 +162,7 @@
"monitors": [
{
'name': 'Secure_Test_Suites_Summary',
- 'start': 'Jumping to the first image slot',
+ 'start': '[Sec Thread]',
'end': '\\x1b\\\[0m',
'pattern': r'\x1b\\[1;34m\\[Sec Thread\\] '
r'(?P<test_case_id>Secure image '