mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00
Code Issues Releases Wiki Activity

Merge fix spread pipeline

Browse Source 
The spread pipeline was failing due to missing tests

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1682
Approved-by: Maxime Bélair <maxime.belair@canonical.com>
Approved-by: Georgia Garcia <georgia.garcia@canonical.com>
Merged-by: Georgia Garcia <georgia.garcia@canonical.com>
This commit is contained in:
Georgia Garcia 2025-05-08 11:22:59 -03:00
commit b7ce9b81fa
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spread.yaml
View File

@ -276,17 +276,20 @@ suites:
echo '$(foreach t,$(TESTS),$(info TEST/$t))' | \ echo '$(foreach t,$(TESTS),$(info TEST/$t))' | \
make -n -f "$SPREAD_PATH"/tests/regression/apparmor/Makefile -f /dev/stdin | \ make -n -f "$SPREAD_PATH"/tests/regression/apparmor/Makefile -f /dev/stdin | \
grep -F TEST/ | \ grep -F TEST/ | \
cut -d / -f 2 | \ cut -d / -f 2 > apparmor-regression-tests.txt
tee apparmor-regression-tests.txt
fail=0 fail=0
missing_tests=()
while read -r V; do while read -r V; do
if ! grep -xF ' TEST/'"$V"': 1' "$SPREAD_PATH"/tests/regression/apparmor/task.yaml; then if ! grep -xqF ' TEST/'"$V"': 1' "$SPREAD_PATH"/tests/regression/apparmor/task.yaml; then
echo "tests/regression/task.yaml: missing test variant: TEST/$V" >&2 missing_tests+=("tests/regression/task.yaml: missing test variant: TEST/$V")
fail=1 fail=1
fi fi
done <apparmor-regression-tests.txt done <apparmor-regression-tests.txt
if [ "$fail" -ne 0 ]; then if [ "$fail" -ne 0 ]; then
echo "exiting due to missing variants listed above" >&2 echo "exiting due to missing variants:" >&2
for msg in "${missing_tests[@]}"; do
echo "$msg" >&2
done
exit 1 exit 1
fi fi

1
tests/regression/apparmor/task.yaml
View File

@ -4,6 +4,7 @@ environment:
TEST/aa_exec: 1 TEST/aa_exec: 1
TEST/aa_policy_cache: 1 TEST/aa_policy_cache: 1
TEST/access: 1 TEST/access: 1
TEST/allow_all: 1
TEST/at_secure: 1 TEST/at_secure: 1
TEST/attach_disconnected: 1 TEST/attach_disconnected: 1
TEST/capabilities: 1 TEST/capabilities: 1

1
utils/test/task.yaml
View File

@ -28,6 +28,7 @@ environment:
TEST/logparser: logparser TEST/logparser: logparser
TEST/logprof: logprof TEST/logprof: logprof
TEST/minitools: minitools TEST/minitools: minitools
TEST/modifiers: modifiers
TEST/mount: mount TEST/mount: mount
TEST/mqueue: mqueue TEST/mqueue: mqueue
TEST/network: network TEST/network: network