lava_helpers: use base template in musca jobs
This allows to use common timeout structure and prevents breaking musca
jobs in the future.
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Change-Id: I84c71ab01c624cca66845b727f75b4d2d0160993
diff --git a/lava_helper/jinja2_templates/musca_b1.jinja2 b/lava_helper/jinja2_templates/musca_b1.jinja2
index bed8953..4b1dd61 100644
--- a/lava_helper/jinja2_templates/musca_b1.jinja2
+++ b/lava_helper/jinja2_templates/musca_b1.jinja2
@@ -4,21 +4,8 @@
# SPDX-License-Identifier: BSD-3-Clause
#
#-----------------------------------------------------------------------------#}
-device_type: {{ device_type }}
-job_name: {{ job_name }}
-
-timeouts:
- action:
- minutes: {{ action_timeout }}
- actions:
- power-off:
- seconds: {{ poweroff_timeout }}
- job:
- minutes: {{ job_timeout }}
-
-priority: medium
-visibility: public
-
+{% extends 'jinja2_templates/base.jinja2' %}
+{% block actions %}
actions:
- deploy:
timeout:
@@ -42,7 +29,9 @@
'{{monitor.fixup.pass}}': pass
'{{monitor.fixup.fail}}': fail
{% endfor %}
+{% endblock %}
+{% block metadata %}
metadata:
build_no: {{ build_no }}
compiler: {{ compiler }}
@@ -52,4 +41,4 @@
platform: {{ platform }}
build_name: {{ build_name }}
build_job_url: {{ build_job_url }}
-
+{% endblock %}
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 7bc9f60..1373c21 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -2396,6 +2396,7 @@
"device_type": "musca-b",
"job_timeout": 24,
"action_timeout": 12,
+ "monitor_timeout": 10,
"poweroff_timeout": 40,
"platforms": {"MUSCA_B1": ""},
"compilers": ["GNUARM", "ARMCLANG"],