From 6ae7ac0f8988002b71ebea5c9986600c95d73682 Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Sun, 21 Sep 2025 21:04:32 -0400 Subject: [PATCH] ci(debian): move workaround to the test case Including workaround in the test case itself will allow to pass it downstream. These workarounds are still needed. --- test/TEST-12-UEFI/test.sh | 10 ++++++++++ test/TEST-43-KERNEL-INSTALL/test.sh | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/test/TEST-12-UEFI/test.sh b/test/TEST-12-UEFI/test.sh index 2ff1e16d9..326f801d5 100755 --- a/test/TEST-12-UEFI/test.sh +++ b/test/TEST-12-UEFI/test.sh @@ -17,6 +17,11 @@ test_check() { fi [[ -n "$(ovmf_code)" ]] + + if command -v systemd-detect-virt > /dev/null && ! systemd-detect-virt -c &> /dev/null; then + echo "This test assumes that it runs inside a CI container." + return 1 + fi } client_run() { @@ -50,6 +55,11 @@ test_setup() { KVERSION=$(determine_kernel_version "$TESTDIR"/tmp-initramfs.root) + # workaround for kernel-install for Debian + if ! [ -e /usr/lib/modules/"$KVERSION"/vmlinuz ]; then + ln -sf /boot/vmlinuz-"$KVERSION" /usr/lib/modules/"$KVERSION"/vmlinuz + fi + mksquashfs "$TESTDIR"/dracut.*/initramfs/ "$TESTDIR"/squashfs.img -quiet -no-progress mkdir -p "$TESTDIR"/ESP/EFI/BOOT "$TESTDIR"/dracut.conf.d diff --git a/test/TEST-43-KERNEL-INSTALL/test.sh b/test/TEST-43-KERNEL-INSTALL/test.sh index d170f224a..3dba1edf6 100755 --- a/test/TEST-43-KERNEL-INSTALL/test.sh +++ b/test/TEST-43-KERNEL-INSTALL/test.sh @@ -56,6 +56,11 @@ test_setup() { KVERSION=$(determine_kernel_version "$TESTDIR"/initramfs.root) + # workaround for kernel-install for Debian + if ! [ -e /usr/lib/modules/"$KVERSION"/vmlinuz ]; then + ln -sf /boot/vmlinuz-"$KVERSION" /usr/lib/modules/"$KVERSION"/vmlinuz + fi + dd if=/dev/zero of="$TESTDIR"/root.img bs=200MiB count=1 status=none && sync "$TESTDIR"/root.img mkfs.ext4 -q -L dracut -d "$TESTDIR"/dracut.*/initramfs/ "$TESTDIR"/root.img && sync "$TESTDIR"/root.img -- 2.47.3