2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-09-21 08:33:20 +00:00

build(xcatprobe): declare listener tool dependency

(cherry picked from commit 6d59e60331)
This commit is contained in:
Vinícius Ferrão
2026-07-17 14:32:16 -03:00
parent dd0b123346
commit 886c08e9aa
3 changed files with 20 additions and 1 deletions
+1 -1
View File
@@ -7,6 +7,6 @@ Standards-Version: 3.9.4
Package: xcat-probe
Architecture: all
Depends: ${perl:Depends}
Depends: ${perl:Depends}, iproute2 | net-tools
Recommends: wget, dnsutils, tftp-hpa, tcpdump
Description: Provides a toolkit to probe possible issues in xCAT
+6
View File
@@ -27,6 +27,12 @@ Requires: /usr/bin/tftp
Requires: /usr/bin/wget
# Tool detect_dhcpd requires tcpdump
Requires: /usr/sbin/tcpdump
# TCP listener checks use ss, which is packaged differently on SUSE.
%if 0%{?suse_version}
Requires: iproute2
%else
Requires: iproute
%endif
%endif
%description
@@ -23,6 +23,8 @@ my @affected_subcommands = qw(
);
my $builder = read_file('buildrpms.pl');
my $rpm_spec = read_file('xCAT-probe/xCAT-probe.spec');
my $debian_control = read_file('xCAT-probe/debian/control');
like($builder, qr/sub prepare_xcat_probe_source_tar\b/, 'RPM builder has dedicated xCAT-probe source preparation');
like(
$builder,
@@ -45,6 +47,17 @@ ok(
'xCAT-probe source preparation runs before worker processes fork'
);
like(
$rpm_spec,
qr/%if 0%\{\?suse_version\}\s+Requires: iproute2\s+%else\s+Requires: iproute\s+%endif/s,
'RPM package requires the distro-specific provider of ss'
);
like(
$debian_control,
qr/^Depends:.*\biproute2\s*\|\s*net-tools\b/m,
'Debian package requires ss or the legacy netstat provider'
);
for my $helper (@helpers) {
my $source = File::Spec->catfile($repo_root, 'perl-xCAT', 'xCAT', $helper);
ok(-f $source, "$helper source exists");