From 3d0c1158ddbf15c95ce8d1efb83340731ee2d693 Mon Sep 17 00:00:00 2001
From: Nikita Dubrovskii <nikita@linux.ibm.com>
Date: Mon, 21 Aug 2023 09:26:53 +0200
Subject: [PATCH] qemu: drop supportsIsoKargs check cause now all platfroms
 support it

---
 mantle/cmd/kola/testiso.go |  3 +++
 mantle/platform/qemu.go    | 15 +++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mantle/cmd/kola/testiso.go b/mantle/cmd/kola/testiso.go
index be9b3d0ecc..206494a2c7 100644
--- a/mantle/cmd/kola/testiso.go
+++ b/mantle/cmd/kola/testiso.go
@@ -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",
diff --git a/mantle/platform/qemu.go b/mantle/platform/qemu.go
index 1268f1f3ed..ab40a2623f 100644
--- a/mantle/platform/qemu.go
+++ b/mantle/platform/qemu.go
@@ -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
@@ -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")