test: Default to linux qemu firmware

Direct kernel boot results in much faster boot times so let's use
it by default.

We disable it for tests that need to reboot because +-50% of the
time, doing a reboot when using direct kernel boot causes qemu to
hang on reboot. Until we figure that out, let's use UEFI for the
tests that need to reboot.

diff --git a/test/TEST-06-SELINUX/meson.build b/test/TEST-06-SELINUX/meson.build
index 50247d3e473862483a3ad35ae045de512d472251..a62d144048e054440121d29b2f84ec1fb096f9be 100644 (file)
--- a/test/TEST-06-SELINUX/meson.build
+++ b/test/TEST-06-SELINUX/meson.build
@@ -2,4 +2,6 @@
 
 test_params += {
         'mkosi_args' : ['--kernel-command-line-extra=apparmor=0 selinux=1 enforcing=0 lsm=selinux systemd.wants=autorelabel.service systemd.wants=firstboot-autorelabel.service'],
+        # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.
+        'firmware' : 'uefi',
 }

diff --git a/test/TEST-09-REBOOT/meson.build b/test/TEST-09-REBOOT/meson.build
index 7f5cc704c9da8bbc73326a321ae9c8f920b91624..a511a829af22cb66ccf6daa17351b0d75985f50d 100644 (file)
--- a/test/TEST-09-REBOOT/meson.build
+++ b/test/TEST-09-REBOOT/meson.build
@@ -2,4 +2,6 @@
 
 test_params += {
         'storage': 'persistent',
+        # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.
+        'firmware' : 'uefi',
 }

diff --git a/test/TEST-18-FAILUREACTION/meson.build b/test/TEST-18-FAILUREACTION/meson.build
new file mode 100644 (file)
index 0000000..e1bca2d
--- /dev/null
+++ b/test/TEST-18-FAILUREACTION/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+test_params += {
+        # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.
+        'firmware' : 'uefi',
+}

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index a32210c06f1bc84bb50bf5639e8fe9d87afc1916..575403344e4f5dbd243902c915ae099ba1351f18 100755 (executable)
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -48,6 +48,7 @@ def main():
     parser.add_argument('--test-name', required=True)
     parser.add_argument('--test-number', required=True)
     parser.add_argument('--storage', required=True)
+    parser.add_argument('--firmware', required=True)
     parser.add_argument('mkosi_args', nargs="*")
     args = parser.parse_args()
 
@@ -119,6 +120,7 @@ def main():
         '--runtime-network=none',
         '--runtime-scratch=no',
         '--append',
+        '--qemu-firmware', args.firmware,
         '--kernel-command-line-extra',
         ' '.join([
             'systemd.hostname=H',

diff --git a/test/meson.build b/test/meson.build
index 43314f8c79484904b5bb9562d7d5a78c76e663d6..f5c48cedba5875d061baca1d2cf8cd2d4a631bf4 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -415,6 +415,7 @@ foreach test_number, dirname : integration_tests
                 'timeout' : 1800,
                 'storage' : 'volatile',
                 'priority' : 0,
+                'firmware' : 'linux',
         }
 
         # TODO: This fs.exists call isn't included in rebuild logic
@@ -430,6 +431,7 @@ foreach test_number, dirname : integration_tests
                 '--test-name', dirname,
                 '--test-number', test_number,
                 '--storage', test_params['storage'],
+                '--firmware', test_params['firmware'],
                 '--',
         ] + test_params['mkosi_args']