From 40e035356fec5fa69144babddafb3772f24c4f4c Mon Sep 17 00:00:00 2001 From: Ricardo Branco Date: Tue, 18 Jun 2024 12:58:09 +0200 Subject: [PATCH] containers: Use a different netcat than ncat --- lib/main_containers.pm | 2 -- tests/containers/aardvark_integration.pm | 2 +- tests/containers/netavark_integration.pm | 8 ++------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/main_containers.pm b/lib/main_containers.pm index 8e36021530ba..d2c289eb2cf9 100644 --- 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 index 5ebae0420001..924e7ce964d9 100644 --- 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 index dc49f9ebfcad..2b4c5d1b4a5f 100644 --- 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";