Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

containers: Use a different netcat than ncat #19541

Merged
merged 1 commit into from
Jun 18, 2024
Merged

containers: Use a different netcat than ncat #19541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/main_containers.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}
Expand Down
2 changes: 1 addition & 1 deletion tests/containers/aardvark_integration.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
8 changes: 2 additions & 6 deletions tests/containers/netavark_integration.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading