Use run_command

Author: ricardobranco777

tests/containers/podman_e2e.pm

@@ -17,19 +17,6 @@ use containers::bats;
 
 my $oci_runtime;
 
-sub install_git {
-    # We need git 2.47.0+ to use `--ours` with `git apply -3`
-    if (is_sle) {
-        my $version = get_var("VERSION");
-        if (is_sle('<16')) {
-            $version =~ s/-/_/;
-            $version = "SLE_$version";
-        }
-        assert_script_run "zypper addrepo https://download.opensuse.org/repositories/Kernel:/tools/$version/Kernel:tools.repo";
-    }
-    assert_script_run "zypper --gpg-auto-import-keys -n install --allow-vendor-change git-core", timeout => 300;
-}
-
 sub setup {
     my @pkgs = qw(aardvark-dns apache2-utils buildah catatonit glibc-devel-static go1.24 gpg2 jq libgpgme-devel
       libseccomp-devel make netavark openssl podman podman-remote skopeo socat sudo systemd-container xfsprogs);
@@ -43,20 +30,20 @@ sub setup {
     record_info "info", script_output("podman info -f json");
 
     # Workaround for https://bugzilla.opensuse.org/show_bug.cgi?id=1248988 - catatonit missing in /usr/libexec/podman/
-    assert_script_run "cp /usr/bin/catatonit /usr/libexec/podman/catatonit";
+    run_command "cp -f /usr/bin/catatonit /usr/libexec/podman/catatonit";
     # rootless user needed for these tests
-    assert_script_run "useradd -m containers";
-    assert_script_run "usermod --add-subuids 100000-165535 containers";
-    assert_script_run "usermod --add-subgids 100000-165535 containers";
+    run_command "useradd -m containers";
+    run_command "usermod --add-subuids 100000-165535 containers";
+    run_command "usermod --add-subgids 100000-165535 containers";
     # Make /run/secrets directory available on containers
-    assert_script_run "echo /var/lib/empty:/run/secrets >> /etc/containers/mounts.conf";
+    run_command "echo /var/lib/empty:/run/secrets >> /etc/containers/mounts.conf";
 
     # Enable SSH
     my $algo = "ed25519";
     systemctl 'enable --now sshd';
-    assert_script_run "ssh-keygen -t $algo -N '' -f ~/.ssh/id_$algo";
-    assert_script_run "cat ~/.ssh/id_$algo.pub >> ~/.ssh/authorized_keys";
-    assert_script_run "ssh-keyscan localhost 127.0.0.1 ::1 | tee -a ~/.ssh/known_hosts";
+    run_command "ssh-keygen -t $algo -N '' -f ~/.ssh/id_$algo";
+    run_command "cat ~/.ssh/id_$algo.pub >> ~/.ssh/authorized_keys";
+    run_command "ssh-keyscan localhost 127.0.0.1 ::1 | tee -a ~/.ssh/known_hosts";
 
     # Download podman sources
     my $version = script_output q(podman --version | awk '{ print $3 }');
@@ -75,9 +62,9 @@ sub setup {
         $branch = $repo;
     }
 
-    assert_script_run "cd ~";
-    assert_script_run "git clone --branch $branch https://github.com/$github_org/podman", timeout => 300;
-    assert_script_run "cd ~/podman";
+    run_command "cd ~";
+    run_command "git clone --branch $branch https://github.com/$github_org/podman", timeout => 300;
+    run_command "cd ~/podman";
 
     unless ($repo) {
         # - https://github.com/containers/podman/pull/26934 - test/e2e: fix 'block all syscalls' seccomp for runc
@@ -87,11 +74,11 @@ sub setup {
             my $url = "https://github.com/$github_org/podman/pull/$patch";
             record_info("patch", $url);
             assert_script_run "curl -O " . data_url("containers/patches/podman/$patch.patch");
-            assert_script_run "git apply -3 --ours $patch.patch";
+            run_command "git apply -3 --ours $patch.patch";
         }
         # This test fails with:
         # Command exited 125 as expected, but did not emit 'failed to connect: dial tcp: lookup '
-        assert_script_run "rm -f test/e2e/image_scp_test.go";
+        run_command "rm -f test/e2e/image_scp_test.go";
     }
 }
 
@@ -113,7 +100,7 @@ sub run {
     my $env = join " ", map { "$_=$env{$_}" } sort keys %env;
 
     foreach my $target (qw(localintegration remoteintegration)) {
-        script_run "env $env make $target |& tee $target.txt", timeout => 1800;
+        run_command "env $env make $target |& tee $target.txt || true", timeout => 1800;
         script_run qq{sed -ri '0,/name=/s/name="Libpod Suite"/name="$target"/' report.xml};
         script_run "mv -v report.xml $target.xml";
         parse_extra_log(XUnit => "$target.xml");