From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 13 Mar 2024 13:16:17 +0000 (+0100)
Subject: ci: Enable KVM
X-Git-Tag: v22~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1df7631faabe020f8d8c1aa78682b1482ba15e6;p=thirdparty%2Fmkosi.git

ci: Enable KVM

Since https://github.blog/2024-01-17-github-hosted-runners-double-the-power-for-open-source/,
it seems that KVM has started working, so let's make sure we take
advantage of it to speed up CI.
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 846c1fa8a..1e2c3cd6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -149,7 +149,7 @@ jobs:
         Environment=SYSTEMD_REPART_MKFS_OPTIONS_EROFS="--quiet"
 
         [Host]
-        QemuKvm=no
+        QemuKvm=yes
         EOF
 
         # Work around for https://src.fedoraproject.org/rpms/grub2/pull-request/61 by disabling obsoletes.
diff --git a/tests/test_boot.py b/tests/test_boot.py
index 9086aea94..0030ef399 100644
--- a/tests/test_boot.py
+++ b/tests/test_boot.py
@@ -32,6 +32,8 @@ def test_format(config: Image.Config, format: OutputFormat) -> None:
             "--kernel-command-line=systemd.unit=mkosi-check-and-shutdown.service",
             "--incremental",
             "--ephemeral",
+            # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions
+            "--qemu-firmware=uefi" if format in (OutputFormat.disk, OutputFormat.uki) else "--qemu-firmware=auto",
         ],
     ) as image:
         if image.config.distribution == Distribution.rhel_ubi and format in (OutputFormat.esp, OutputFormat.uki):
@@ -79,7 +81,9 @@ def test_bootloader(config: Image.Config, bootloader: Bootloader) -> None:
     if config.distribution == Distribution.rhel_ubi:
         return
 
-    firmware = QemuFirmware.linux if bootloader == Bootloader.none else QemuFirmware.auto
+    # TODO: Use "auto" again instead of "uefi" once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is
+    # fixed in Github Actions.
+    firmware = QemuFirmware.linux if bootloader == Bootloader.none else QemuFirmware.uefi
 
     with Image(
         config,
diff --git a/tests/test_initrd.py b/tests/test_initrd.py
index 916c94a0d..c2327734e 100644
--- a/tests/test_initrd.py
+++ b/tests/test_initrd.py
@@ -63,6 +63,8 @@ def test_initrd(initrd: Image) -> None:
             "--incremental",
             "--ephemeral",
             "--format=disk",
+            # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions
+            "--qemu-firmware=uefi",
         ]
     ) as image:
         image.build()
@@ -185,6 +187,9 @@ def test_initrd_luks(initrd: Image, passphrase: Path) -> None:
                 "--incremental",
                 "--ephemeral",
                 "--format=disk",
+                # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github
+                # Actions.
+                "--qemu-firmware=uefi",
             ]
         ) as image:
             image.build()