From 293a925e9e418ba3d6f2f35a338cbf16609fb932 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 18 Dec 2025 17:51:06 +0000 Subject: [PATCH 1/3] Revert "integration-test: check tools distribution rather than image distribution" This reverts commit fd2cdadc1467c7f57866d45fb579e7cf3830bf54. --- .../integration-test-wrapper.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/test/integration-tests/integration-test-wrapper.py b/test/integration-tests/integration-test-wrapper.py index c65a77f3bb..738fe60681 100755 --- a/test/integration-tests/integration-test-wrapper.py +++ b/test/integration-tests/integration-test-wrapper.py @@ -75,18 +75,6 @@ class Summary: ) -def tools_os_release(field: str) -> str: - return subprocess.run( - [ - 'bash', - '-c', - f'set -eu; . /etc/os-release; echo ${field}', - ], - stdout=subprocess.PIPE, - text=True, - ).stdout.rstrip() - - def process_coredumps(args: argparse.Namespace, journal_file: Path) -> bool: # Collect executable paths of all coredumps and filter out the expected ones. @@ -630,11 +618,11 @@ def main() -> None: # XXX: debug for https://github.com/systemd/systemd/issues/38240 if vm: # Tracing is not supported in centos/fedora qemu builds - if tools_os_release('ID') in ('centos', 'fedora'): + if summary.distribution in ('centos', 'fedora'): cmd += ['--qemu-args=-d cpu_reset,guest_errors -D /dev/stderr'] else: cmd += [ - '--qemu-args=-d cpu_reset,guest_errors,trace:kvm_run_exit_system_event,trace:qemu_system_*_request -D /dev/stderr' # noqa: E501 + '--qemu-args=-d cpu_reset,guest_errors,trace:kvm_run_exit_system_event,trace:qemu_system_\*_request -D /dev/stderr' # noqa: E501 ] try: From d6514ebf3351a287ceac579addeaf6e7e677ee5a Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 18 Dec 2025 17:51:07 +0000 Subject: [PATCH 2/3] Revert "tests: also add qemu shutdown trace debug logs to integration script" This reverts commit 9b42cc3b12c17a4b02d713b2ad499a74acecea1f. --- test/integration-tests/integration-test-wrapper.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/integration-tests/integration-test-wrapper.py b/test/integration-tests/integration-test-wrapper.py index 738fe60681..f7d7807a68 100755 --- a/test/integration-tests/integration-test-wrapper.py +++ b/test/integration-tests/integration-test-wrapper.py @@ -617,13 +617,7 @@ def main() -> None: # XXX: debug for https://github.com/systemd/systemd/issues/38240 if vm: - # Tracing is not supported in centos/fedora qemu builds - if summary.distribution in ('centos', 'fedora'): - cmd += ['--qemu-args=-d cpu_reset,guest_errors -D /dev/stderr'] - else: - cmd += [ - '--qemu-args=-d cpu_reset,guest_errors,trace:kvm_run_exit_system_event,trace:qemu_system_\*_request -D /dev/stderr' # noqa: E501 - ] + cmd += ['--qemu-args=-d cpu_reset,guest_errors -D /dev/stderr'] try: result = subprocess.run(cmd) From 84079cd158bff31ffea27ef265e7da832652ea0f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 18 Dec 2025 17:51:07 +0000 Subject: [PATCH 3/3] Revert "tests: run qemu with cpu_reset,guest_errors debug messages" This reverts commit b169c7512c9cf3ac8eb2b15141e0b9fab9e8961e. --- test/integration-tests/integration-test-wrapper.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/integration-tests/integration-test-wrapper.py b/test/integration-tests/integration-test-wrapper.py index f7d7807a68..0bbfb6044d 100755 --- a/test/integration-tests/integration-test-wrapper.py +++ b/test/integration-tests/integration-test-wrapper.py @@ -615,10 +615,6 @@ def main() -> None: *(['--', '--capability=CAP_BPF'] if not vm else []), ] # fmt: skip - # XXX: debug for https://github.com/systemd/systemd/issues/38240 - if vm: - cmd += ['--qemu-args=-d cpu_reset,guest_errors -D /dev/stderr'] - try: result = subprocess.run(cmd)