lava_helper_configs: Adjusted Jinja2 Template
* Changed whitespace handling
* Recovery will now be deployed only once per test
* Fixed the recovery store job name in the configuration
Signed-off-by: Minos Galanakis <minos.galanakis@linaro.org>
Change-Id: I1f834e0458b6f3c1f45f5b66bbdb8a509e00ec3e
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 858e71f..cff2404 100644
--- a/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2
+++ b/lava_helper/jinja2_templates/template_tfm_mps2_sse_200.jinja2
@@ -20,11 +20,7 @@
visibility: public
actions:
-{%- for platform, recovery in platforms.items() -%}
- {%- for compiler in compilers %}
- {%- for build_type in build_types %}
- {%- for boot_type in boot_types %}
- {%- for name, test in tests.items() -%}
+{%- for platform, recovery in platforms.items() %}
- deploy:
to: mps
images:
@@ -32,7 +28,10 @@
url: {{ recovery_store_url }}/lastSuccessfulBuild/artifact/{{ recovery }}
compression: gz
namespace: target
-
+ {% for compiler in compilers %}
+ {%- for build_type in build_types %}
+ {%- for boot_type in boot_types %}
+ {%- for name, test in tests.items() -%}
- deploy:
to: mps
images:
@@ -66,7 +65,7 @@
'{{monitor.fixup.pass}}': pass
'{{monitor.fixup.fail}}': fail
{%- endfor %}
- {%- endfor %}
+ {% endfor %}
{%- endfor %}
{%- endfor %}
{%- endfor %}
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index e723f7e..b4165a9 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -52,7 +52,7 @@
"action_timeout": 60,
"monitor_timeout": 60,
"recovery_store_url": "https://ci.trustedfirmware.org/"
- "job/tf-m-build-test-review",
+ "job/tf-m-fpga-image-store",
"artifact_store_url": "https://ci.trustedfirmware.org/"
"job/tf-m-build-test-review",
"platforms": {"AN521": "mps2_sse200_an512.tar.gz"},