Revert "integration-test: check tools distribution rather than image distribution"

This reverts commit fd2cdadc1467c7f57866d45fb579e7cf3830bf54.

diff --git a/test/integration-tests/integration-test-wrapper.py b/test/integration-tests/integration-test-wrapper.py
index c65a77f3bb131e2d7aa5b2077055d3acac2125e3..738fe60681b16f0ca014426cec3d7098104bbb0b 100755 (executable)
--- 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: