Skip to content

testiso: Do not add disk as primary disk for s390x pXE test #1336

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

Closed
Prashanth684 wants to merge 1 commit into from
Closed

testiso: Do not add disk as primary disk for s390x pXE test #1336

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
31 changes: 22 additions & 9 deletions mantle/cmd/kola/testiso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,27 +104,40 @@ func init() {
root.AddCommand(cmdTestIso)
}

func newQemuBuilder() *platform.QemuBuilder {
func newQemuBuilder(isPXE bool) *platform.QemuBuilder {
builder := platform.NewMetalQemuBuilderDefault()
builder.Firmware = kola.QEMUOptions.Firmware
sectorSize := 0
if kola.QEMUOptions.Native4k {
sectorSize = 4096
}
builder.AddPrimaryDisk(&platform.Disk{
Size: "12G", // Arbitrary

SectorSize: sectorSize,
})

// https://github.com/coreos/fedora-coreos-tracker/issues/388
// https://github.com/coreos/fedora-coreos-docs/pull/46
builder.Memory = 4096
primaryDiskAdded := false
if system.RpmArch() == "s390x" {
// For s390x PXE installs the network device has the bootindex of 1.
// Do not use a primary disk in case of net-booting for this test
if isPXE {
builder.AddDisk(&platform.Disk{
Size: "12G", // Arbitrary

SectorSize: sectorSize,
})
primaryDiskAdded = true
}
// FIXME - determine why this is
builder.Memory = int(math.Max(float64(builder.Memory), 16384))
builder.Memory = int(math.Max(float64(builder.Memory), 8192))
}

if !primaryDiskAdded {
builder.AddPrimaryDisk(&platform.Disk{
Size: "12G", // Arbitrary

SectorSize: sectorSize,
})
}
builder.InheritConsole = console

return builder
Expand Down Expand Up @@ -304,7 +317,7 @@ func testPXE(inst platform.Install) error {
configStr = string(buf)
}

inst.Builder = newQemuBuilder()
inst.Builder = newQemuBuilder(true)
completionChannel, err := inst.Builder.VirtioChannelRead("testisocompletion")
if err != nil {
return err
Expand All @@ -320,7 +333,7 @@ func testPXE(inst platform.Install) error {
}

func testLiveIso(inst platform.Install, completionfile string) error {
inst.Builder = newQemuBuilder()
inst.Builder = newQemuBuilder(false)
completionChannel, err := inst.Builder.VirtioChannelRead("testisocompletion")
if err != nil {
return err
Expand Down