containers: Re-enable podman upstream tests on aarch64

os-autoinst · Aug 14, 2024 · adf5e92 · adf5e92
1 parent 7470809
commit adf5e92
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/lib/containers/bats.pm b/lib/containers/bats.pm
@@ -16,7 +16,7 @@ use testapi;
 use utils;
 use strict;
 use warnings;
-use version_utils qw(is_transactional is_sle);
+use version_utils qw(is_transactional is_sle is_sle_micro);
 use transactional qw(trup_call check_reboot_changes);
 use serial_terminal qw(select_user_serial_terminal);
 use registration qw(add_suseconnect_product get_addon_fullname);
@@ -26,10 +26,25 @@ our @EXPORT = qw(install_bats install_htpasswd install_ncat remove_mounts_conf s
 sub install_ncat {
     return if (script_run("rpm -q ncat") == 0);
 
-    my $ncat_version = get_required_var("NCAT_VERSION");
+    my $version = "15";
+    if (is_sle_micro('<6.0')) {
+        if (is_sle_micro('>5.4')) {
+            $version = "15_SP5";
+        } elsif (is_sle_micro('>5.2')) {
+            $version = "15_SP4";
+        } else {
+            $version = "15_SP3";
+        }
+    } elsif (is_sle) {
+        $version = get_required_var("VERSION");
+        $version =~ s/-/_/g;
+    }
+
+    my $repo = "https://download.opensuse.org/repositories/network:/utilities/SLE_$version/network:utilities.repo";
 
     my @cmds = (
-        "rpm -vhU https://nmap.org/dist/ncat-$ncat_version.x86_64.rpm",
+        "zypper addrepo $repo",
+        "zypper --gpg-auto-import-keys -n install ncat",
         "ln -sf /usr/bin/ncat /usr/bin/nc"
     );
     foreach my $cmd (@cmds) {

diff --git a/lib/main_containers.pm b/lib/main_containers.pm
@@ -303,7 +303,7 @@ sub load_container_tests {
             loadtest 'containers/skopeo_integration' if (is_tumbleweed || is_microos || is_sle || is_leap || is_sle_micro('>=5.5'));
         }
         if (!check_var('PODMAN_BATS_SKIP', 'all')) {
-            loadtest 'containers/podman_integration' if (is_x86_64);
+            loadtest 'containers/podman_integration';
         }
         if (!check_var('RUNC_BATS_SKIP', 'all')) {
             loadtest 'containers/runc_integration' if (is_tumbleweed || is_sle || is_leap);