Skip to content

Commit

Permalink
testiso: add new PXE tests instead of '--pxe-append-rootfs' switch
Browse files Browse the repository at this point in the history
The `kola testiso` command supported `--pxe-append-rootfs`, but it
was never used in CI, and probably was also ignored by developers.
This PR drops that switch and adds 1 new test for each arch:
- pxe-[online|offline]-install.rootfs-appended
  • Loading branch information
nikita-dubrovskii authored and dustymabe committed Mar 5, 2025
1 parent 707c2d6 commit 3ca9484
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions mantle/cmd/kola/testiso.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ var (

instInsecure bool

pxeAppendRootfs bool
pxeKernelArgs []string
pxeKernelArgs []string

console bool

Expand Down Expand Up @@ -97,7 +96,7 @@ var (
"miniso-install.nm.bios",
"miniso-install.4k.uefi",
"miniso-install.4k.nm.uefi",
"pxe-offline-install.bios",
"pxe-offline-install.rootfs-appended.bios",
"pxe-offline-install.4k.uefi",
"pxe-online-install.bios",
"pxe-online-install.4k.uefi",
Expand All @@ -107,7 +106,7 @@ var (
"iso-offline-install.s390fw",
"iso-offline-install.mpath.s390fw",
"iso-offline-install.4k.s390fw",
"pxe-online-install.s390fw",
"pxe-online-install.rootfs-appended.s390fw",
"pxe-offline-install.s390fw",
"miniso-install.s390fw",
"miniso-install.nm.s390fw",
Expand All @@ -126,7 +125,7 @@ var (
"miniso-install.nm.ppcfw",
"miniso-install.4k.ppcfw",
"miniso-install.4k.nm.ppcfw",
"pxe-online-install.ppcfw",
"pxe-online-install.rootfs-appended.ppcfw",
"pxe-offline-install.4k.ppcfw",
// FIXME https://github.com/coreos/fedora-coreos-tracker/issues/1657
//"iso-offline-install-iscsi.ibft.ppcfw",
Expand All @@ -144,7 +143,7 @@ var (
"miniso-install.4k.uefi",
"miniso-install.4k.nm.uefi",
"pxe-offline-install.uefi",
"pxe-offline-install.4k.uefi",
"pxe-offline-install.rootfs-appended.4k.uefi",
"pxe-online-install.uefi",
"pxe-online-install.4k.uefi",
// FIXME https://github.com/coreos/fedora-coreos-tracker/issues/1657
Expand Down Expand Up @@ -340,7 +339,6 @@ var iscsi_butane_config string
func init() {
cmdTestIso.Flags().BoolVarP(&instInsecure, "inst-insecure", "S", false, "Do not verify signature on metal image")
cmdTestIso.Flags().BoolVar(&console, "console", false, "Connect qemu console to terminal, turn off automatic initramfs failure checking")
cmdTestIso.Flags().BoolVar(&pxeAppendRootfs, "pxe-append-rootfs", false, "Append rootfs to PXE initrd instead of fetching at runtime")
cmdTestIso.Flags().StringSliceVar(&pxeKernelArgs, "pxe-kargs", nil, "Additional kernel arguments for PXE")

root.AddCommand(cmdTestIso)
Expand Down Expand Up @@ -542,9 +540,8 @@ func runTestIso(cmd *cobra.Command, args []string) (err error) {
}()

baseInst := platform.Install{
CosaBuild: kola.CosaBuild,
PxeAppendRootfs: pxeAppendRootfs,
NmKeyfiles: make(map[string]string),
CosaBuild: kola.CosaBuild,
NmKeyfiles: make(map[string]string),
}

if instInsecure {
Expand Down Expand Up @@ -581,6 +578,8 @@ func runTestIso(cmd *cobra.Command, args []string) (err error) {
fmt.Printf("Running test: %s\n", test)
components := strings.Split(test, ".")

inst.PxeAppendRootfs = kola.HasString("rootfs-appended", components)

if kola.HasString("4k", components) {
enable4k = true
inst.Native4k = true
Expand Down

0 comments on commit 3ca9484

Please sign in to comment.