From 9f6cfc385430d81bc920d3d50e08643291627f57 Mon Sep 17 00:00:00 2001 From: Abdulwasiu Apalowo Date: Mon, 20 Jun 2022 18:33:59 +0100 Subject: [PATCH 1/4] templates: test: Split test_status macro out --- kcidb/templates/test.j2 | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/kcidb/templates/test.j2 b/kcidb/templates/test.j2 index a83f5d6e..7c3e16d3 100644 --- a/kcidb/templates/test.j2 +++ b/kcidb/templates/test.j2 @@ -37,20 +37,24 @@ reject("none") | join(" ") | default(test.id, true) -}} {% endmacro %} +{% macro test_status(waived_status_nodes) %} + {% for waived, status_nodes in waived_status_nodes.items() %} + {% for status, nodes in status_nodes.items() %} + {% if nodes %} + {{- " " + waived_status_emoji(waived, status) + + " " + (nodes | length | string) -}} + {% endif %} + {% endfor %} + {% endfor %} +{% endmacro %} + {% macro container_summary(container, max_list_len) %} {% if container.tests %} {{- "\nTESTS" }} {% set waived_status_nodes = container.tests_root.waived_status_nodes %} {{- "\n Status" }} {{- "\n " -}} - {% for waived, status_nodes in waived_status_nodes.items() %} - {% for status, nodes in status_nodes.items() %} - {% if nodes %} - {{- " " + waived_status_emoji(waived, status) + - " " + (nodes | length | string) -}} - {% endif %} - {% endfor %} - {% endfor %} + {{ test_status(waived_status_nodes) }} {{- "" }} {% set errored_nodes = waived_status_nodes[false]["ERROR"] %} {% if errored_nodes %} From 891f074f0f40a9d8cdd54d8b6487b5b884ab0287 Mon Sep 17 00:00:00 2001 From: Abdulwasiu Apalowo Date: Mon, 4 Jul 2022 09:23:33 +0100 Subject: [PATCH 2/4] templates: build: Split build_format macro out --- kcidb/templates/build.j2 | 41 +++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/kcidb/templates/build.j2 b/kcidb/templates/build.j2 index 721472ff..cf55db3d 100644 --- a/kcidb/templates/build.j2 +++ b/kcidb/templates/build.j2 @@ -6,6 +6,24 @@ reject("none") | join(" ") | default(build.id, true) -}} {% endmacro %} +{%- macro get_build_format(space, invalid, valid, unknown) -%} + {{- + "%" + space + "s" + + ((" %s %" + + (invalid | string | length | string) + "s") + if invalid else + "%.0s%.0s") + + ((" %s %" + + (valid | string | length | string) + "s") + if valid else + "%.0s%.0s") + + ((" %s %" + + (unknown | string | length | string) + "s") + if unknown else + "%.0s%.0s") + -}} +{% endmacro %} + {% macro container_summary(container, max_list_len) %} {% if container.builds %} {{- "\nBUILDS" }} @@ -19,23 +37,12 @@ {% set invalid_build_count = invalid_builds | length %} {% set valid_build_count = valid_builds | length %} {% set unknown_build_count = unknown_builds | length %} - {% set build_fmt = - "%" + - ((8 + (container.architecture_valid_builds | - map("default", "", true) | map("length") | max)) | string) + - "s" + - ((" %s %" + - (invalid_build_count | string | length | string) + "s") - if invalid_build_count else - "%.0s%.0s") + - ((" %s %" + - (valid_build_count | string | length | string) + "s") - if valid_build_count else - "%.0s%.0s") + - ((" %s %" + - (unknown_build_count | string | length | string) + "s") - if unknown_build_count else - "%.0s%.0s") + {% set space = (( 8 + (container.architecture_valid_builds | + map("default", "", true) | map("length") | max)) | string) %} + {% set build_fmt = get_build_format(space, + invalid_build_count, + valid_build_count, + unknown_build_count) %} {% macro status(architecture, invalid_build_count, From 4d7f993aa9565e793d66798ff2dd2d268b5c7f73 Mon Sep 17 00:00:00 2001 From: Abdulwasiu Apalowo Date: Sun, 10 Jul 2022 18:22:55 +0100 Subject: [PATCH 3/4] templates: Create macro for build overview Signed-off-by: Abdulwasiu Apalowo --- kcidb/templates/build.j2 | 78 +++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/kcidb/templates/build.j2 b/kcidb/templates/build.j2 index cf55db3d..20efc6ce 100644 --- a/kcidb/templates/build.j2 +++ b/kcidb/templates/build.j2 @@ -24,6 +24,43 @@ -}} {% endmacro %} +{%- macro status(architecture, + invalid_build_count, + valid_build_count, + unknown_build_count, + build_fmt) -%} + {{- build_fmt | format("?" if architecture is none + else architecture, + "❌" if invalid_build_count else "➖", + (invalid_build_count | string) + if invalid_build_count else "", + "✅" if valid_build_count else "➖", + (valid_build_count | string) + if valid_build_count else "", + "❓" if unknown_build_count else "➖", + (unknown_build_count | string) + if unknown_build_count else "") -}} +{% endmacro %} + +{%- macro build_status(container, space="") -%} + {% set invalid_build_count = + container | selectattr("valid", "false") | list | length %} + {% set valid_build_count = + container | selectattr("valid", "true") | list | length %} + {% set unknown_build_count = + container | selectattr("valid", "none") | list | length %} + {% set build_fmt = get_build_format(space, + invalid_build_count, + valid_build_count, + unknown_build_count) + %} + {{- status("", + invalid_build_count, + valid_build_count, + unknown_build_count, + build_fmt) -}} +{% endmacro %} + {% macro container_summary(container, max_list_len) %} {% if container.builds %} {{- "\nBUILDS" }} @@ -34,43 +71,20 @@ {% set unknown_builds = container.builds | selectattr("valid", "none") | list %} {{- "\n Status" }} - {% set invalid_build_count = invalid_builds | length %} - {% set valid_build_count = valid_builds | length %} - {% set unknown_build_count = unknown_builds | length %} {% set space = (( 8 + (container.architecture_valid_builds | map("default", "", true) | map("length") | max)) | string) %} - {% set build_fmt = get_build_format(space, - invalid_build_count, - valid_build_count, - unknown_build_count) - %} - {% macro status(architecture, - invalid_build_count, - valid_build_count, - unknown_build_count) %} - {{- build_fmt | format("?" if architecture is none - else architecture, - "❌" if invalid_build_count else "➖", - (invalid_build_count | string) - if invalid_build_count else "", - "✅" if valid_build_count else "➖", - (valid_build_count | string) - if valid_build_count else "", - "❓" if unknown_build_count else "➖", - (unknown_build_count | string) - if unknown_build_count else "") -}} - {% endmacro %} - {{- status("", - invalid_build_count, - valid_build_count, - unknown_build_count) }} + {{- build_status(container.builds, space) }} {{- "\n Architectures" }} - {% for architecture, valid_builds + {% for architecture, arch_valid_builds in container.architecture_valid_builds.items() %} {{- status(architecture, - valid_builds[false] | length, - valid_builds[true] | length, - valid_builds[none] | length) }} + arch_valid_builds[false] | length, + arch_valid_builds[true] | length, + arch_valid_builds[none] | length, + get_build_format(space, + invalid_builds | length, + valid_builds | length, + unknown_builds | length)) }} {% endfor %} {% if invalid_builds %} {{- " Failures" }} From 707e538fdd359d1e84ea21c50162624c027941a7 Mon Sep 17 00:00:00 2001 From: Abdulwasiu Apalowo Date: Tue, 19 Jul 2022 17:29:10 +0100 Subject: [PATCH 4/4] templates: Break out build/test summaries Signed-off-by: Abdulwasiu Apalowo --- kcidb/templates/build_description.txt.j2 | 3 +-- kcidb/templates/checkout_description.txt.j2 | 5 ++--- kcidb/templates/revision_description.txt.j2 | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kcidb/templates/build_description.txt.j2 b/kcidb/templates/build_description.txt.j2 index e54c4fb0..393749db 100644 --- a/kcidb/templates/build_description.txt.j2 +++ b/kcidb/templates/build_description.txt.j2 @@ -13,8 +13,7 @@ OVERVIEW Build: {{ misc_macros.valid_badge(build.valid) }} {% if build.tests %} - Tests: {{ test_macros.waived_status_badge(build.tests_root.waived, - build.tests_root.status) }} + Tests: {{ test_macros.test_status(build.tests_root.waived_status_nodes) }} {% endif %} BUILD diff --git a/kcidb/templates/checkout_description.txt.j2 b/kcidb/templates/checkout_description.txt.j2 index 10f0f746..a60b1a4a 100644 --- a/kcidb/templates/checkout_description.txt.j2 +++ b/kcidb/templates/checkout_description.txt.j2 @@ -13,11 +13,10 @@ OVERVIEW Checkout: {{ misc_macros.valid_badge(checkout.valid) }} {% if checkout.builds %} - Builds: {{ misc_macros.valid_badge(checkout.builds_valid) }} + Builds: {{ build_macros.build_status(checkout.builds) }} {% endif %} {% if checkout.tests %} - Tests: {{ test_macros.waived_status_badge(checkout.tests_root.waived, - checkout.tests_root.status) }} + Tests: {{ test_macros.test_status(checkout.tests_root.waived_status_nodes) }} {% endif %} CHECKOUT diff --git a/kcidb/templates/revision_description.txt.j2 b/kcidb/templates/revision_description.txt.j2 index db83b243..d91d51fc 100644 --- a/kcidb/templates/revision_description.txt.j2 +++ b/kcidb/templates/revision_description.txt.j2 @@ -15,11 +15,10 @@ OVERVIEW Patches: {{ misc_macros.valid_badge(revision.checkouts_valid) }} {% endif %} {% if revision.builds %} - Builds: {{ misc_macros.valid_badge(revision.builds_valid) }} + Builds: {{ build_macros.build_status(revision.builds) }} {% endif %} {% if revision.tests %} - Tests: {{ test_macros.waived_status_badge(revision.tests_root.waived, - revision.tests_root.status) }} + Tests: {{ test_macros.test_status(revision.tests_root.waived_status_nodes) }} {% endif %} REVISION