xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-09-24 08:44:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7831 from VersatusHPC/fix/ci-ubuntu-ppc-boot-files

Browse Source 
fix(xcat-core): nodeset cannot boot an Ubuntu POWER install from live media
This commit is contained in:
Daniel Hilst
2026-09-17 11:36:27 -03:00
committed by GitHub
parent af2a4c08d5 28e59642ca
commit 782a2a57b0
2 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/xcat/plugins/debian.pm
+28 -4
View File
@@ -191,6 +191,8 @@ my %INSTALL_BOOT_FILES = (
'ppc64' => [
[ 'install/netboot/ubuntu-installer/{darch}/vmlinux', 'install/netboot/ubuntu-installer/{darch}/initrd.gz' ],
[ 'install/vmlinux', 'install/netboot/initrd.gz' ],
[ 'casper/hwe-vmlinux', 'casper/hwe-initrd' ],
[ 'casper/vmlinux', 'casper/initrd' ],
],
'riscv64' => [
[ 'casper/vmlinux', 'casper/initrd' ],
@@ -379,6 +381,27 @@ sub _no_grub2_loader {
return;
}
#-------------------------------------------------------
=head3 install_media_is_bootable
Descriptions: Report whether copied media carries an install kernel and initrd.
Arguments:
$arch - the xCAT architecture of the node
$darch - the dpkg architecture
$pkgdir - the directory copycds wrote the media to
Returns: 1 when the media can boot a network install, 0 when it cannot
=cut
#-------------------------------------------------------
sub install_media_is_bootable
{
my ($arch, $darch, $pkgdir) = @_;
return install_boot_files($arch, $darch, $pkgdir) ? 1 : 0;
}
sub is_ubuntu_live_media
{
my $media_path = shift;
@@ -1176,10 +1199,11 @@ sub mkinstall {
next;
}
if ($arch =~ /ppc64/i and !(-e "$pkgdir/install/netboot/initrd.gz") and
!(-e "$pkgdir/install/netboot/ubuntu-installer/$darch/initrd.gz")) {
xCAT::MsgUtils->report_node_error($callback, $node,
"The network boot initrd.gz is not found in $pkgdir/install/netboot. This is provided by Ubuntu, please download and retry."
# The POWER live-server ISO keeps its installer under casper and ships no netboot
# tree, so the media that can boot it is the media install_boot_files resolves.
unless (install_media_is_bootable($arch, $darch, $pkgdir)) {
xCAT::MsgUtils->report_node_error($callback, $node,
"No install kernel and initrd were found on the media in $pkgdir."
);
next;
}
xCAT-test/unit/debian_install_boot_files.t
+53 -4
View File
@@ -7,10 +7,9 @@ use File::Temp qw(tempdir);
use FindBin;
use Test::More;
# The installer kernel and initrd sit in a different place on every Ubuntu media layout:
# netboot trees name them after the Debian architecture, live images keep them under
# casper, and a hardware-enablement kernel ships beside the release one. Build each layout
# on disk and ask the resolver, rather than reading the table that describes them.
# The installer kernel and initrd sit in a different place on every Ubuntu media layout.
# Build each layout on disk and ask the resolver, rather than read the table that
# describes them.
use lib "$FindBin::Bin/../../perl-xCAT";
use lib "$FindBin::Bin/../../xCAT-server/lib/perl";
@@ -103,6 +102,56 @@ is(
'riscv64 does not accept the kernel name the other live images use',
);
# The Ubuntu ppc64el live-server ISO carries no netboot tree. 22.04 and 24.04 ship the
# hardware-enablement pair under casper beside the release pair; 26.04 ships the release
# pair only.
is(
resolved('ppc64le', 'ppc64el', media('casper/vmlinux', 'casper/initrd')),
'casper/vmlinux|casper/initrd',
'the POWER live image keeps its kernel under casper',
);
is(
resolved('ppc64le', 'ppc64el',
media('casper/hwe-vmlinux', 'casper/hwe-initrd', 'casper/vmlinux', 'casper/initrd')),
'casper/hwe-vmlinux|casper/hwe-initrd',
'the POWER hardware-enablement kernel wins over the release kernel',
);
is(
resolved('ppc64le', 'ppc64el',
media('install/netboot/ubuntu-installer/ppc64el/vmlinux',
'install/netboot/ubuntu-installer/ppc64el/initrd.gz',
'casper/vmlinux', 'casper/initrd')),
'install/netboot/ubuntu-installer/ppc64el/vmlinux|install/netboot/ubuntu-installer/ppc64el/initrd.gz',
'a POWER netboot tree still wins over a live image on the same media',
);
# mkinstall asks this routine, so it accepts every media install_boot_files resolves.
can_ok('xCAT_plugin::debian', 'install_media_is_bootable');
is(
xCAT_plugin::debian::install_media_is_bootable('ppc64le', 'ppc64el',
media('casper/vmlinux', 'casper/initrd')),
1,
'a POWER live image is bootable media',
);
is(
xCAT_plugin::debian::install_media_is_bootable('ppc64le', 'ppc64el',
media('install/netboot/ubuntu-installer/ppc64el/vmlinux',
'install/netboot/ubuntu-installer/ppc64el/initrd.gz')),
1,
'a POWER netboot tree is bootable media',
);
is(
xCAT_plugin::debian::install_media_is_bootable('ppc64le', 'ppc64el', media('README')),
0,
'media with no installer is not bootable media',
);
is(
xCAT_plugin::debian::install_media_is_bootable('x86_64', 'amd64',
media('casper/vmlinuz', 'casper/initrd')),
1,
'an x86 live image is bootable media',
);
# --- nothing to boot -------------------------------------------------------
is(resolved('x86_64', 'amd64', media('casper/vmlinuz')), undef,
'a kernel without its initrd is not a match');