From beadd8a8581af260fbf6daf0373c7cc397bbc332 Mon Sep 17 00:00:00 2001 From: Jeny Sadadia Date: Fri, 16 Aug 2024 15:13:53 +0530 Subject: [PATCH] stable-rc: separate build configs with `, ` In the Boot failures section, use `, ` separator for different build configs for a build architecture for better readability. Also, improve formatting with proper indentation. Signed-off-by: Jeny Sadadia --- kcidb/templates/stable_rc.j2 | 1 + kcidb/templates/stable_rc_test.j2 | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/kcidb/templates/stable_rc.j2 b/kcidb/templates/stable_rc.j2 index f49291ff..4b904fb2 100644 --- a/kcidb/templates/stable_rc.j2 +++ b/kcidb/templates/stable_rc.j2 @@ -1,2 +1,3 @@ {# stable-rc macros #} {% set selected_origins = ['maestro', 'broonie'] %} +{% set indent = " " %} diff --git a/kcidb/templates/stable_rc_test.j2 b/kcidb/templates/stable_rc_test.j2 index 1a98c152..fd918356 100644 --- a/kcidb/templates/stable_rc_test.j2 +++ b/kcidb/templates/stable_rc_test.j2 @@ -1,5 +1,6 @@ {# Test macros #} {% import "stable_rc.j2" as stable_rc_macros %} +{% from "stable_rc.j2" import indent %} {% macro tests_stats(container) %} {% if container.tests %} @@ -23,13 +24,13 @@ selectattr('build.architecture', 'ne', None) | list %} {% if boot_tests_info %} {% for architecture, tests in boot_tests_info|groupby("build.architecture") %} - {{- "\n " + architecture }}:({{ tests|map(attribute="build.config_name") | unique | reject("none") | join("") }}) - {{- "\n -" + tests|map(attribute="environment_misc.platform") | unique | join("\n -") }} - {{- "\n CI system: " + origin}} + {{- "\n" + indent + architecture }}:({{ tests|map(attribute="build.config_name") | unique | reject("none") | join(",\n" + indent + ' ' * (architecture + ":(") | length ) }}) + {{- "\n" + indent + "-" + tests|map(attribute="environment_misc.platform") | unique | join("\n -") }} + {{- "\n" + indent + "CI system: " + origin}} {% endfor %} {% else %} - {{- "\n Missing failure information. Sorry, we are working on improving report for this situation." }} - {{- "\n CI system: " + origin}} + {{- "\n" + indent + "Missing failure information. Sorry, we are working on improving report for this situation." }} + {{- "\n" + indent + "CI system: " + origin}} {% endif %} {% endfor %} {% else %}