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/lava_helper/jinja2_templates/fvp_mps2.jinja2 b/lava_helper/jinja2_templates/fvp_mps2.jinja2
new file mode 100644
index 0000000..e2b70eb
--- /dev/null
+++ b/lava_helper/jinja2_templates/fvp_mps2.jinja2
@@ -0,0 +1,72 @@
+{#------------------------------------------------------------------------------
+# Copyright (c) 2018-2019, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-----------------------------------------------------------------------------#}
+{% extends 'jinja2_templates/base.jinja2' %}
+{% block metadata %}
+{{ super() }}
+{% endblock %}
+{% block base %}
+{{ super() }}
+{% endblock %}
+{% block actions %}
+context:
+ kernel_start_message: ''
+
+actions:
+- deploy:
+ namespace: docker
+ to: fvp
+ images:
+ ns:
+ url: {{ firmware_url }}
+ s:
+ url: {{ bootloader_url }}
+
+- boot:
+ failure_retry: 3
+ namespace: docker
+ method: fvp
+ docker:
+ name: {{ docker_prefix }}/lava-fvp-mps2
+ prompts:
+ - 'root@lava '
+ image: /opt/model/FVP_MPS2_AEMv8M
+ timeout:
+ minutes: 5
+ console_string: 'telnetterminal0: Listening for serial connection on port (?P<PORT>\d+)'
+ license_variable: '{{ license_variable }}'
+ arguments:
+ - "--application cpu0={NS}"
+ - "--data cpu0={S}@{{ data_bin_offset }}"
+ - "--parameter fvp_mps2.platform_type=2"
+ - "--parameter cpu0.baseline={{ cpu0_baseline }}"
+ - "--parameter cpu0.INITVTOR_S={{ cpu0_initvtor_s }}"
+ - "--parameter cpu0.semihosting-enable=0"
+ - "--parameter fvp_mps2.DISABLE_GATING=0"
+ - "--parameter fvp_mps2.telnetterminal0.start_telnet=1"
+ - "--parameter fvp_mps2.telnetterminal1.start_telnet=1"
+ - "--parameter fvp_mps2.telnetterminal2.start_telnet=1"
+ - "--parameter fvp_mps2.telnetterminal0.quiet=0"
+ - "--parameter fvp_mps2.telnetterminal1.quiet=0"
+ - "--parameter fvp_mps2.telnetterminal2.quiet=0"
+ - "--parameter fvp_mps2.UART0.shutdown_on_eot=1"
+ - "--parameter fvp_mps2.mps2_visualisation.disable-visualisation=1"
+ prompts:
+ - '(.*)'
+
+- test:
+ namespace: target
+ monitors:
+ {%- for monitor in test.monitors %}
+ - name: "{{monitor.name}}"
+ start: "{{monitor.start}}"
+ end: "{{monitor.end}}"
+ pattern: "{{monitor.pattern}}"
+ fixupdict:
+ '{{monitor.fixup.pass}}': pass
+ '{{monitor.fixup.fail}}': fail
+ {%- endfor %}
+{% endblock %}