Revert "qemu: drop supportsIsoKargs check cause now all platfroms sup…

…port it"

This reverts commit 3d0c115.

mantle/cmd/kola/testiso.go

@@ -99,9 +99,6 @@ 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",

mantle/platform/qemu.go

@@ -1396,6 +1396,13 @@ 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
@@ -1440,9 +1447,11 @@ 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
- stderr := stderrb.String()
- plog.Warningf("running coreos-installer iso kargs modify: %v: %q", err, stderr)
- plog.Warning("likely targeting an old CoreOS ISO; ignoring...")
+ 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...")
+ }
  }
  } else if len(builder.AppendKernelArgs) > 0 {
  return fmt.Errorf("coreos-installer does not support appending kernel args")