mkosi: Migrate more deprecated options

(cherry picked from commit 28baef47a3098bd82b27c0a629df6c5f885693e7)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index cea1e84af201cbcff737c3cc4c18f9f4fd885d82..e678283143b11566c02fcadf8a0f66a946e640a7 100644 (file)
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -64,7 +64,7 @@ jobs:
                   COVERAGE=1
 
           [Runtime]
-          QemuMem=4G
+          RAM=4G
           EOF
 
       - name: Generate secure boot key

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 873ed589b693600d2b10382f22725a124ad338fb..d4b37f72b071025a50fe6dc45100c6fa506ec146 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -171,7 +171,7 @@ jobs:
           SELinuxRelabel=${{ matrix.relabel }}
 
           [Runtime]
-          QemuMem=4G
+          RAM=4G
           EOF
 
       - name: Generate secure boot key

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index d44e8f8bd674ec001e378306b2ce127ae2c63dce..ef6df8840f50dad4fc12a64c782c971284199a1a 100755 (executable)
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -479,9 +479,8 @@ def main() -> None:
         '--runtime-network=none',
         '--runtime-scratch=no',
         *args.mkosi_args,
-        '--qemu-firmware',
-        args.firmware,
-        *(['--qemu-kvm', 'no'] if int(os.getenv('TEST_NO_KVM', '0')) else []),
+        '--firmware', args.firmware,
+        *(['--kvm', 'no'] if int(os.getenv('TEST_NO_KVM', '0')) else []),
         '--kernel-command-line-extra',
         ' '.join(
             [
@@ -504,7 +503,7 @@ def main() -> None:
         ),
         '--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}",
         *(['--runtime-build-sources=no'] if not sys.stderr.isatty() else []),
-        'qemu' if args.vm or os.getuid() != 0 or os.getenv('TEST_PREFER_QEMU', '0') == '1' else 'boot',
+        'vm' if args.vm or os.getuid() != 0 or os.getenv('TEST_PREFER_QEMU', '0') == '1' else 'boot',
     ]  # fmt: skip
 
     result = subprocess.run(cmd)