LAVA: Deprecate redundant codes in LAVA helper
LAVA monitor only relies on bl2, regression tests and psa arch tests.
This patch updates the LAVA helper logics to select LAVA monitor in a
much easier way, instead of looping all build params.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ic00ce2ac308dcf4bd502212bb4e56234576b430f
diff --git a/lava_helper/jinja2_templates/qemu_mps2_bl2.jinja2 b/lava_helper/jinja2_templates/qemu_mps2_bl2.jinja2
index 644b6c4..1cb7602 100644
--- a/lava_helper/jinja2_templates/qemu_mps2_bl2.jinja2
+++ b/lava_helper/jinja2_templates/qemu_mps2_bl2.jinja2
@@ -17,7 +17,7 @@
minutes: 10
- test:
monitors:
- {%- for monitor in test.monitors %}
+ {%- for monitor in monitors %}
- name: "{{monitor.name}}"
start: "{{monitor.start}}"
end: "{{monitor.end}}"
@@ -28,7 +28,9 @@
{%- if monitor.fixup.skip %}
'{{monitor.fixup.skip}}': skip
{%- endif %}
- 'SIM ERROR': fail
+ {%- if monitor.fixup.sim_error %}
+ '{{monitor.fixup.sim_error}}': fail
+ {%- endif %}
{%- endfor %}
context:
@@ -59,9 +61,6 @@
metadata:
build_no: {{ build_no }}
- compiler: {{ compiler }}
- build_type: {{ build_type }}
- boot_type: {{ boot_type }}
name: {{ name }}
platform: {{ platform }}
build_name: {{ build_name }}