From c07b0093d825c8e302b5a6bc3b25418ff415bf4e Mon Sep 17 00:00:00 2001 From: Georgia Garcia Date: Thu, 8 May 2025 09:55:52 -0300 Subject: [PATCH 1/3] spread: improve error message when regression test is missing Due to how the debug information shows up when something fails in spread the information is hard to figure out. See this example when the allow_all test was missing https://gitlab.com/apparmor/apparmor/-/jobs/9958642493 Signed-off-by: Georgia Garcia --- spread.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/spread.yaml b/spread.yaml index 41f21da80..9c619912a 100644 --- a/spread.yaml +++ b/spread.yaml @@ -276,17 +276,20 @@ suites: echo '$(foreach t,$(TESTS),$(info TEST/$t))' | \ make -n -f "$SPREAD_PATH"/tests/regression/apparmor/Makefile -f /dev/stdin | \ grep -F TEST/ | \ - cut -d / -f 2 | \ - tee apparmor-regression-tests.txt + cut -d / -f 2 > apparmor-regression-tests.txt fail=0 + missing_tests=() while read -r V; do - if ! grep -xF ' TEST/'"$V"': 1' "$SPREAD_PATH"/tests/regression/apparmor/task.yaml; then - echo "tests/regression/task.yaml: missing test variant: TEST/$V" >&2 + if ! grep -xqF ' TEST/'"$V"': 1' "$SPREAD_PATH"/tests/regression/apparmor/task.yaml; then + missing_tests+=("tests/regression/task.yaml: missing test variant: TEST/$V") fail=1 fi done &2 + echo "exiting due to missing variants:" >&2 + for msg in "${missing_tests[@]}"; do + echo "$msg" >&2 + done exit 1 fi From 2c1ed72cbbbdb93fbb28c5de5cf9ec60f7157301 Mon Sep 17 00:00:00 2001 From: Georgia Garcia Date: Thu, 8 May 2025 10:52:42 -0300 Subject: [PATCH 2/3] spread: add allow_all to list of spread regression tests Signed-off-by: Georgia Garcia --- tests/regression/apparmor/task.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/regression/apparmor/task.yaml b/tests/regression/apparmor/task.yaml index f9292508b..3f45decff 100644 --- a/tests/regression/apparmor/task.yaml +++ b/tests/regression/apparmor/task.yaml @@ -4,6 +4,7 @@ environment: TEST/aa_exec: 1 TEST/aa_policy_cache: 1 TEST/access: 1 + TEST/allow_all: 1 TEST/at_secure: 1 TEST/attach_disconnected: 1 TEST/capabilities: 1 From d6951bab60bfbf07eb3a1bc1e6ce94031381b1c7 Mon Sep 17 00:00:00 2001 From: Georgia Garcia Date: Thu, 8 May 2025 10:53:11 -0300 Subject: [PATCH 3/3] spread: add modifiers to list of spread utils tests Signed-off-by: Georgia Garcia --- utils/test/task.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/test/task.yaml b/utils/test/task.yaml index 1595f8e6b..4d3e8890d 100644 --- a/utils/test/task.yaml +++ b/utils/test/task.yaml @@ -28,6 +28,7 @@ environment: TEST/logparser: logparser TEST/logprof: logprof TEST/minitools: minitools + TEST/modifiers: modifiers TEST/mount: mount TEST/mqueue: mqueue TEST/network: network