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.

diff --git a/test/TEST-12-UEFI/test.sh b/test/TEST-12-UEFI/test.sh
index 2ff1e16d9bfdccc6cfefd1930a9a55df5dc97f7d..326f801d59f6801a62df3242878839d1e0803ad9 100755 (executable)
--- 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 d170f224ae779507d0492247719112324b984751..3dba1edf6aa674fa67ec31a5987cac06b19ab304 100755 (executable)
--- 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