xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-09-21 16:39:30 +00:00
Code Issues Releases Wiki Activity

test(xcat-core): capture the genesis specs leaving %{tarch} unexpanded

Browse Source 
A riscv64 build of xcat-core fails at xCAT-genesis-scripts:

  ERROR: Cannot find/open srpm: dist/rocky-10-riscv64-xcat/rpms/SRPMS/
  xCAT-genesis-scripts-riscv64-2.19.0-snap202609020458.src.rpm

The srpm on disk is named xCAT-genesis-scripts-%{tarch}-2.19.0-....src.rpm.
xCAT-genesis-scripts.spec and xCAT-genesis-base.spec take the package name from
%{tarch}, which an %ifarch ladder sets. That ladder has no riscv64 branch, so
%{tarch} stays literal and rpm builds a package with a macro in its name.

The test expands both specs with rpmspec for every arch xCAT supports and
asserts the Name carries that arch. It fails on riscv64 for both specs.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
(cherry picked from commit 07a0e79e42ec39eaf1ed6e9291ab6b3f6f869e97)
This commit is contained in:
Daniel Hilst
2026-09-02 12:41:00 -03:00
parent fd580b901f
commit 3992a3c9c4
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-test/unit/genesis_spec_target_arch.t
+47
View File
@@ -0,0 +1,47 @@
#!/usr/bin/env perl
# The genesis specs name their package after the target arch: xCAT-genesis-scripts-<tarch> and
# xCAT-genesis-base-<tarch>. %{tarch} comes from an %ifarch ladder, and an arch missing from that
# ladder leaves the macro UNEXPANDED instead of failing: rpm then builds a package literally named
# "xCAT-genesis-scripts-%{tarch}", buildrpms.pl cannot find the srpm it asked for, and the whole
# target build dies with a "Cannot find/open srpm" that names the right file.
#
# Expand each spec with rpmspec for every arch xCAT supports and assert the Name carries that arch.
use strict;
use warnings;
use FindBin;
use Test::More;
my $root = "$FindBin::Bin/../..";
sub command_exists { my ($c) = @_; return system("command -v $c >/dev/null 2>&1") == 0 }
plan skip_all => 'rpmspec is not installed' unless command_exists('rpmspec');
# arch under test => the tarch the spec must resolve it to (x86 and ppc64 are historical names
# genesis keeps; see genesis_tarch_from_targetarch in buildrpms.pl).
my %tarch = (
x86_64 => 'x86_64',
i686 => 'x86',
ppc64le => 'ppc64',
aarch64 => 'aarch64',
riscv64 => 'riscv64',
);
my %spec = (
'xCAT-genesis-scripts' => "$root/xCAT-genesis-scripts/xCAT-genesis-scripts.spec",
'xCAT-genesis-base' => "$root/xCAT-genesis-builder/xCAT-genesis-base.spec",
);
for my $pkg (sort keys %spec) {
my $spec = $spec{$pkg};
ok(-f $spec, "$pkg spec is present") or next;
for my $arch (sort keys %tarch) {
my $name = `rpmspec --target $arch -q --qf '%{NAME}' --define 'version 2.19.0' --define 'release snap0' @{[quotemeta $spec]} 2>/dev/null`;
chomp $name;
is($name, "$pkg-$tarch{$arch}", "$pkg on $arch is named $pkg-$tarch{$arch}");
unlike($name, qr/%\{/, "$pkg on $arch leaves no unexpanded macro in its name");
}
}
done_testing();