From c50ee47a8fbc6ccb39d0c2641af213a0dbdb97cf Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 23 Jan 2025 10:40:27 +0100 Subject: [PATCH] Remove check for systemd-journal group The check for the systemd-journal group is not needed and is removed. --- tests/containers/rootless_podman.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/containers/rootless_podman.pm b/tests/containers/rootless_podman.pm index a3e62267fddc..eba2c2a94709 100644 --- a/tests/containers/rootless_podman.pm +++ b/tests/containers/rootless_podman.pm @@ -37,9 +37,7 @@ sub run { # add testuser to systemd-journal group to allow non-root # user to access container logs via journald event driver # bsc#1207673, bsc#1218023 - if (is_leap("<16.0") || is_sle("<16")) { - assert_script_run "usermod -a -G systemd-journal $testapi::username"; - } + assert_script_run("usermod -aG systemd-journal $testapi::username") if (is_leap("<16") || is_sle("<16")); if (get_var('TDUP')) { my $cont_storage = '/etc/containers/storage.conf'; @@ -57,8 +55,7 @@ sub run { switch_cgroup_version($self, 2); select_serial_terminal; - validate_script_output 'podman info', sub { /cgroupVersion: v2/ }; - validate_script_output "id $testapi::username", sub { /systemd-journal/ }; + validate_script_output('podman info', sub { /cgroupVersion: v2/ }, fail_message => "podman not operating in cgroup v2"); } # Check for bsc#1192051