From 18c769b0ff6c704fd31ba1f81f35c188fbe02bc9 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 19 Feb 2024 11:23:31 +0100 Subject: [PATCH 1/2] Revert "test: use btrfs by default on Arch as well" There's something very wrong going on when using btrfs for the test images, namely: - there's a significant performance hit, i.e. the Arch Linux run is ~20% slower, in the coverage run the situation is even worse - intermittent boot failures - intermittent "No space left on device" errors (even though there's enough free space) Since debugging this might take a while, let's temporarily revert back to ext4 to make the CI stable again. This reverts commit 7eb7e3ec4f5dbc13ee729557e1544527f3101187. --- test/test-functions | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/test-functions b/test/test-functions index 6a9a1291de..a3bb4abc00 100644 --- a/test/test-functions +++ b/test/test-functions @@ -47,13 +47,9 @@ KERNEL_VER="${KERNEL_VER-$(uname -r)}" QEMU_TIMEOUT="${QEMU_TIMEOUT:-1800}" NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-1800}" TIMED_OUT= # will be 1 after run_* if *_TIMEOUT is set and test timed out +get_bool "$LOOKS_LIKE_SUSE" && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}" UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}" EFI_MOUNT="${EFI_MOUNT:-$(bootctl -x 2>/dev/null || echo /boot)}" -if get_bool "$LOOKS_LIKE_SUSE" || get_bool "$LOOKS_LIKE_ARCH"; then - FSTYPE="${FSTYPE:-btrfs}" -else - FSTYPE="${FSTYPE:-ext4}" -fi # Note that defining a different IMAGE_NAME in a test setup script will only result # in default.img being copied and renamed. It can then be extended by defining # a test_append_files() function. The $1 parameter will be the root directory. From bbac11c99369226663a965931fc5755069c25c95 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 19 Feb 2024 10:37:30 +0100 Subject: [PATCH 2/2] test: temporarily enable session lingering for the test user So the user daemon with the long-running service is not killed while we test the journal: [ 834.077080] testsuite-04.sh[10937]: Running as unit: user-sleep.service; invocation ID: b1f2c9c9a14a40ce836c867139d14dc8 [ 834.077687] systemd[10943]: Started user-sleep.service. [ 834.078437] (sd-pam)[10952]: pam_unix(login:session): session closed for user testuser [ 834.078643] systemd[1]: run-u3.service: Deactivated successfully. [ 834.078710] testsuite-04.sh[10930]: + for _ in {0..9} [ 834.078710] testsuite-04.sh[10930]: + journalctl --rotate ... [ 834.081253] systemd[1]: session-7.scope: Deactivated successfully. ... [ 844.602065] testsuite-04.sh[10930]: + journalctl --rotate [ 844.630414] testsuite-04.sh[10930]: + journalctl --sync [ 844.632005] systemd[1]: Stopping user@4711.service... [ 844.634179] systemd[10943]: Activating special unit exit.target... [ 844.635769] systemd[10943]: Stopped target default.target. [ 844.636136] systemd[10943]: Stopped target timers.target. [ 844.636479] systemd[10943]: Stopping user-sleep.service... [ 844.636998] systemd[10943]: Stopped user-sleep.service. ... [ 844.758893] testsuite-04.sh[10930]: + systemctl stop --user -M testuser@ user-sleep.service [ 845.213399] systemctl[11066]: Failed to stop user-sleep.service: Unit user-sleep.service not loaded. --- test/units/testsuite-04.journal-corrupt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/units/testsuite-04.journal-corrupt.sh b/test/units/testsuite-04.journal-corrupt.sh index 051d0ab0a8..c25cf54873 100755 --- a/test/units/testsuite-04.journal-corrupt.sh +++ b/test/units/testsuite-04.journal-corrupt.sh @@ -10,6 +10,7 @@ rm -f "/var/log/journal/$(