Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions mantle/kola/harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ const snoozeFormat = "2006-01-02"
// This overlaps with SkipBaseChecksTag above, but is really a special flag for kola-denylist.yaml.
const SkipConsoleWarningsTag = "skip-console-warnings"

// NeedsSecureBoot will setup the machines with uefi with secure boot enabled on supported platforms
const secureBoot = "secure-boot"

var (
plog = capnslog.NewPackageLogger("github.com/coreos/coreos-assembler/mantle", "kola")

Expand Down Expand Up @@ -338,6 +341,10 @@ func testRequiresInternet(test *register.Test) bool {
return HasString(NeedsInternetTag, test.Tags)
}

func testSecureBoot(test *register.Test) bool {
return HasString(secureBoot, test.Tags)
}

func markTestForRerunSuccess(test *register.Test, msg string) {
if !HasString(AllowRerunSuccessTag, test.Tags) {
plog.Warningf("%s Adding as candidate for rerun success: %s", msg, test.Name)
Expand Down Expand Up @@ -1762,6 +1769,10 @@ func runTest(h *harness.H, t *register.Test, pltfrm string, flight platform.Flig
InstanceType: t.InstanceType,
}

if testSecureBoot(t) {
options.Firmware = "uefi-secure"
}

// Providers sometimes fail to bring up a machine within a
// reasonable time frame. Let's try twice and then bail if
// it doesn't work.
Expand Down
1 change: 1 addition & 0 deletions mantle/platform/machine/qemu/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ func (qc *Cluster) NewMachineWithOptions(userdata *conf.UserData, options platfo
}
return qc.NewMachineWithQemuOptions(userdata, platform.QemuMachineOptions{
MachineOptions: options,
Firmware: options.Firmware,
})
}

Expand Down
1 change: 1 addition & 0 deletions mantle/platform/platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ type MachineOptions struct {
AppendFirstbootKernelArgs string
SkipStartMachine bool // Skip platform.StartMachine on machine bringup
InstanceType string
Firmware string
}

// SystemdDropin is a userdata type agnostic struct representing a systemd dropin
Expand Down
Loading