Skip to content

Commit

Permalink
qemu: drop supportsIsoKargs check cause now all platfroms support it
Browse files Browse the repository at this point in the history
  • Loading branch information
nikita-dubrovskii authored and cgwalters committed Aug 21, 2023
1 parent 5a6cbe3 commit 3d0c115
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
3 changes: 3 additions & 0 deletions mantle/cmd/kola/testiso.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ var (
// "iso-offline-install.4k.s390fw",
"pxe-online-install.s390fw",
"pxe-offline-install.s390fw",
"miniso-install.s390fw",
"miniso-install.nm.s390fw",
"miniso-install.4k.nm.s390fw",
}
tests_ppc64le = []string{
"iso-live-login.ppcfw",
Expand Down
15 changes: 3 additions & 12 deletions mantle/platform/qemu.go
Original file line number Diff line number Diff line change
Expand Up @@ -1396,13 +1396,6 @@ func coreosInstallerSupportsISOKargs() (bool, error) {
return strings.Contains(out, "kargs"), nil
}

// supportsIsoKargs returns true if we support modifying ISO kargs on the
// current arch. We could also auto-detect this, but would probably still want
// some assertions that we detected as supported on !s390x.
func (builder *QemuBuilder) supportsIsoKargs() bool {
return builder.architecture != "s390x"
}

func (builder *QemuBuilder) setupIso() error {
if err := builder.ensureTempdir(); err != nil {
return err
Expand Down Expand Up @@ -1447,11 +1440,9 @@ func (builder *QemuBuilder) setupIso() error {
return errors.Wrapf(err, "running `coreos-installer iso kargs modify`; old CoreOS ISO?")
}
// Only actually emit a warning if we expected it to be supported
if builder.supportsIsoKargs() {
stderr := stderrb.String()
plog.Warningf("running coreos-installer iso kargs modify: %v: %q", err, stderr)
plog.Warning("likely targeting an old CoreOS ISO; ignoring...")
}
stderr := stderrb.String()
plog.Warningf("running coreos-installer iso kargs modify: %v: %q", err, stderr)
plog.Warning("likely targeting an old CoreOS ISO; ignoring...")
}
} else if len(builder.AppendKernelArgs) > 0 {
return fmt.Errorf("coreos-installer does not support appending kernel args")
Expand Down

0 comments on commit 3d0c115

Please sign in to comment.