diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 587a1c0c5b..87a073b1b4 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -72,7 +72,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 873ed589b6..a043022ce0 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -60,56 +60,56 @@ jobs: llvm: 0 cflags: "-O2 -D_FORTIFY_SOURCE=3" relabel: no - qemu: 1 + vm: 1 - distro: debian release: testing sanitizers: "" llvm: 0 cflags: "-Og" relabel: no - qemu: 0 + vm: 0 - distro: ubuntu release: noble sanitizers: "" llvm: 0 cflags: "-Og" relabel: no - qemu: 0 + vm: 0 - distro: fedora release: "41" sanitizers: "" llvm: 0 cflags: "-Og" relabel: yes - qemu: 0 + vm: 0 - distro: fedora release: rawhide sanitizers: address,undefined llvm: 1 cflags: "-Og" relabel: yes - qemu: 0 + vm: 0 - distro: opensuse release: tumbleweed sanitizers: "" llvm: 0 cflags: "-Og" relabel: no - qemu: 0 + vm: 0 - distro: centos release: "9" sanitizers: "" llvm: 0 cflags: "-Og" relabel: yes - qemu: 0 + vm: 0 - distro: centos release: "10" sanitizers: "" llvm: 0 cflags: "-Og" relabel: yes - qemu: 0 + vm: 0 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -171,7 +171,7 @@ jobs: SELinuxRelabel=${{ matrix.relabel }} [Runtime] - QemuMem=4G + RAM=4G EOF - name: Generate secure boot key @@ -194,7 +194,7 @@ jobs: sudo --preserve-env \ mkosi sandbox \ env \ - TEST_PREFER_QEMU=${{ matrix.qemu }} \ + TEST_PREFER_QEMU=${{ matrix.vm }} \ meson test \ -C build \ --no-rebuild \ diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py index d44e8f8bd6..ef6df8840f 100755 --- 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)