xCAT/xcat-dep
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-dep.git synced 2026-10-18 01:30:32 +00:00
Code Issues Projects Releases Wiki Activity

fix(xcat-dep): check a published perl-Net-DNS pin against the published rpm

Browse Source 
t/net_dns_rr_types.t compared every perl-Net-DNS pin in the manifest
with the version of perl-Net-DNS/Net-DNS.spec. openeuler-24.03-ppc64le
does not build that spec. Its input catalog pins the openEuler
perl-Net-DNS-1.40 rpm as a publisher input, so its pin of 1.40 failed
against the spec's 1.57, and package-tests is red on master.

For a target whose catalog publishes perl-Net-DNS, compare the pin with
the version in the pinned rpm name. Other targets still compare with
the spec.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
This commit is contained in:
Daniel Hilst
2026-09-29 12:54:11 -03:00
parent 67a80db63a
commit 8cdfb940e3
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
t/net_dns_rr_types.t
+18 -2
View File
@@ -20,6 +20,7 @@ use Archive::Tar;
use version;
use MockBuildUtils qw(read_manifest version_matches);
use XCAT::BuildUtils qw(read_lines);
use XCAT::NativeInputs qw(load_inputs);
# The records xCAT builds, and the class Net::DNS must return for each. The numbers are the
# algorithm codes of xCAT::DHCP::OmapiPolicy (157 hmac-md5, 163 hmac-sha256, 165 hmac-sha512).
@@ -52,12 +53,22 @@ sub at_least_floor { return version->parse($_[0]) >= version->parse($KEY_FLOOR)
ok(at_least_floor($version),
"the spec builds Net::DNS $KEY_FLOOR or newer ($version), so KEY is in the core distribution");
# Every target whose manifest section lists perl-Net-DNS builds it from this one spec, so the
# records must work for all of them. A target that takes Net::DNS from EPEL is not listed.
# A target that takes Net::DNS from EPEL is not listed in the manifest. A native target can list it
# and still not build it: its input catalog pins the distribution's rpm as a publisher input. The
# pin of such a target names the version of that rpm, not the version of this spec.
my %manifest = read_manifest("$root/packages-manifest.conf");
my @targets = grep { exists $manifest{$_}{'perl-Net-DNS'} } sort keys %manifest;
die 'no manifest target builds perl-Net-DNS; this test covers nothing' unless @targets;
my $native = load_inputs($root, { 'perl-Net-DNS' => 1 });
my $owner = $native->{nodes}{ $native->{outputs}{'perl-Net-DNS'} // '' } // {};
my %shipped;
if (($owner->{type} // '') eq 'publisher') {
my ($published) = ($owner->{url} // '') =~ m{/perl-Net-DNS-(\d+(?:\.\d+)+)-[^/]+\.rpm\z}
or die "cannot read the perl-Net-DNS version from $owner->{url}\n";
$shipped{ $native->{catalog}{target} } = $published;
}
# The pin is the second place the version is written down, and mockbuild-all.pl fails the run
# when the built rpm does not match it. A pin below $KEY_FLOOR puts a Net::DNS without KEY back
# into the repositories a service node reads, which have no EPEL copy to outrank it. An operator
@@ -68,6 +79,11 @@ for my $target (@targets) {
ok($exact, "[$target] the perl-Net-DNS pin ($pin) names one exact version");
ok($exact && at_least_floor($pin),
"[$target] the perl-Net-DNS pin ($pin) is $KEY_FLOOR or newer");
if (my $published = $shipped{$target}) {
ok(version_matches($published, $pin),
"[$target] the perl-Net-DNS pin ($pin) accepts the published rpm the target ships ($published)");
next;
}
ok(version_matches($version, $pin),
"[$target] the perl-Net-DNS pin ($pin) accepts the version the spec builds ($version)");
}