Skip to content

Commit 3f84fd0

Browse files
nikita-dubrovskiijlebon
authored andcommitted
Revert "Revert "qemu: drop supportsIsoKargs check cause now all platfroms support it""
coreos-installer 0.18.0 was released, so we can enable tests again This reverts commit 0c97893.
1 parent 0eb25d1 commit 3f84fd0

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

mantle/cmd/kola/testiso.go

+3
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ var (
104104
// "iso-offline-install.4k.s390fw",
105105
"pxe-online-install.s390fw",
106106
"pxe-offline-install.s390fw",
107+
"miniso-install.s390fw",
108+
"miniso-install.nm.s390fw",
109+
"miniso-install.4k.nm.s390fw",
107110
}
108111
tests_ppc64le = []string{
109112
"iso-live-login.ppcfw",

mantle/platform/qemu.go

+3-12
Original file line numberDiff line numberDiff line change
@@ -1447,13 +1447,6 @@ func coreosInstallerSupportsISOKargs() (bool, error) {
14471447
return strings.Contains(out, "kargs"), nil
14481448
}
14491449

1450-
// supportsIsoKargs returns true if we support modifying ISO kargs on the
1451-
// current arch. We could also auto-detect this, but would probably still want
1452-
// some assertions that we detected as supported on !s390x.
1453-
func (builder *QemuBuilder) supportsIsoKargs() bool {
1454-
return builder.architecture != "s390x"
1455-
}
1456-
14571450
func (builder *QemuBuilder) setupIso() error {
14581451
if err := builder.ensureTempdir(); err != nil {
14591452
return err
@@ -1498,11 +1491,9 @@ func (builder *QemuBuilder) setupIso() error {
14981491
return errors.Wrapf(err, "running `coreos-installer iso kargs modify`; old CoreOS ISO?")
14991492
}
15001493
// Only actually emit a warning if we expected it to be supported
1501-
if builder.supportsIsoKargs() {
1502-
stderr := stderrb.String()
1503-
plog.Warningf("running coreos-installer iso kargs modify: %v: %q", err, stderr)
1504-
plog.Warning("likely targeting an old CoreOS ISO; ignoring...")
1505-
}
1494+
stderr := stderrb.String()
1495+
plog.Warningf("running coreos-installer iso kargs modify: %v: %q", err, stderr)
1496+
plog.Warning("likely targeting an old CoreOS ISO; ignoring...")
15061497
}
15071498
} else if len(builder.AppendKernelArgs) > 0 {
15081499
return fmt.Errorf("coreos-installer does not support appending kernel args")

0 commit comments

Comments
 (0)