Skip to content

kola/testiso: fix pxe-*.rootfs-appended test on s390x #4049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikita-dubrovskii merged 1 commit into from
Apr 24, 2025
Merged

kola/testiso: fix pxe-*.rootfs-appended test on s390x #4049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions mantle/cmd/kola/testiso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ var (
"iso-offline-install.s390fw",
"iso-offline-install.mpath.s390fw",
"iso-offline-install.4k.s390fw",
// FIXME: https://github.com/coreos/fedora-coreos-tracker/issues/1883
//"pxe-online-install.rootfs-appended.s390fw",
"pxe-online-install.rootfs-appended.s390fw",
"pxe-offline-install.s390fw",
"miniso-install.s390fw",
"miniso-install.nm.s390fw",
Expand Down
4 changes: 2 additions & 2 deletions mantle/platform/metal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,8 @@ func (t *installerRun) completePxeSetup(kargs []string) error {
// this is only for s390x where the pxe image has to be created;
// s390 doesn't seem to have a pre-created pxe image although have to check on this
if t.pxe.pxeimagepath == "" {
kernelpath := filepath.Join(t.builddir, t.kern.kernel)
initrdpath := filepath.Join(t.builddir, t.kern.initramfs)
kernelpath := filepath.Join(t.tftpdir, t.kern.kernel)
initrdpath := filepath.Join(t.tftpdir, t.kern.initramfs)
Comment thread
nikita-dubrovskii marked this conversation as resolved.
err := exec.Command("/usr/bin/mk-s390image", kernelpath, "-r", initrdpath,
"-p", filepath.Join(pxeconfigdir, "default"), filepath.Join(t.tftpdir, pxeimages[0])).Run()
if err != nil {
Expand Down
Loading