Merge pull request #19541 from ricardobranco777/netcat

containers: Use a different netcat than ncat
os-autoinst · Jun 18, 2024 · d622f14 · d622f14
2 parents 179082e + 40e0353
commit d622f14
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/lib/main_containers.pm b/lib/main_containers.pm
@@ -301,8 +301,6 @@ sub load_container_tests {
         if (!check_var('RUNC_BATS_SKIP', 'all')) {
             loadtest 'containers/runc_integration' if (is_tumbleweed || is_sle('>=15-SP4') || is_leap('>=15.4'));
         }
-        # Some packages are only available on x86_64: ncat
-        return unless (is_x86_64);
         if (!check_var('NETAVARK_BATS_SKIP', 'all')) {
             loadtest 'containers/netavark_integration' if (is_tumbleweed || is_sle('>=15-SP4') || is_leap('>=15.4'));
         }

diff --git a/tests/containers/aardvark_integration.pm b/tests/containers/aardvark_integration.pm
@@ -40,7 +40,7 @@ sub run {
     # Install tests dependencies
     my @pkgs = qw(aardvark-dns firewalld iproute2 iptables jq netavark slirp4netns);
     if (is_tumbleweed) {
-        push @pkgs, qw(dbus-1-daemon ncat);
+        push @pkgs, qw(dbus-1-daemon);
     } elsif (is_sle) {
         push @pkgs, qw(dbus-1);
     }

diff --git a/tests/containers/netavark_integration.pm b/tests/containers/netavark_integration.pm
@@ -38,18 +38,14 @@ sub run {
     enable_modules if is_sle;
 
     # Install tests dependencies
-    my @pkgs = qw(aardvark-dns firewalld iproute2 iptables jq netavark);
+    my @pkgs = qw(aardvark-dns firewalld netcat-openbsd iproute2 iptables jq netavark);
     if (is_tumbleweed) {
-        push @pkgs, qw(dbus-1-daemon ncat);
+        push @pkgs, qw(dbus-1-daemon);
     } elsif (is_sle) {
         push @pkgs, qw(dbus-1);
     }
     install_packages(@pkgs);
 
-    # netavark needs nmap's ncat instead of openbsd-netcat which we override via PATH above
-    # otherwise we can use nc but ignore failures due to openbsd-netcat not handling SIGTERM
-    assert_script_run "cp /usr/bin/ncat /usr/local/bin/nc" unless is_sle;
-
     switch_cgroup_version($self, 2);
 
     $netavark = script_output "rpm -ql netavark | grep podman/netavark";