Skip to content

Commit 2f8a427

Browse files
committed
tests/basic: fix basic tests on multi-arch
Only test UEFI on x86_64 and aarch64. Only test UEFI Secure Boot on x86_64. Don't force the `bios` firmware for the NVMe test; instead, let the QEMU code pick the default firmware for the given architecture. Follow-up to 6775ab1 ("mantle/kola: copy basic tests into formal kola workflow").
1 parent 6775ab1 commit 2f8a427

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

mantle/kola/tests/coretest/core.go

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,22 @@ func init() {
6363
NativeFuncs: nativeFuncs,
6464
})
6565
register.RegisterTest(&register.Test{
66-
Name: "basic.uefi",
67-
Description: "Verify basic functionalities like SSH, systemd services, useradd, etc, with UEFI enabled",
68-
Run: uefiWithBasicTests,
69-
Platforms: []string{"qemu"},
70-
ClusterSize: 0,
71-
NativeFuncs: nativeFuncs,
66+
Name: "basic.uefi",
67+
Description: "Verify basic functionalities like SSH, systemd services, useradd, etc, with UEFI enabled",
68+
Run: uefiWithBasicTests,
69+
Platforms: []string{"qemu"},
70+
ClusterSize: 0,
71+
NativeFuncs: nativeFuncs,
72+
Architectures: []string{"x86_64", "aarch64"},
7273
})
7374
register.RegisterTest(&register.Test{
74-
Name: "basic.uefi-secure",
75-
Description: "Verify basic functionalities like SSH, systemd services, useradd, etc, with UEFI Secure Boot enabled",
76-
Run: uefiSecureWithBasicTests,
77-
Platforms: []string{"qemu"},
78-
ClusterSize: 0,
79-
NativeFuncs: nativeFuncs,
75+
Name: "basic.uefi-secure",
76+
Description: "Verify basic functionalities like SSH, systemd services, useradd, etc, with UEFI Secure Boot enabled",
77+
Run: uefiSecureWithBasicTests,
78+
Platforms: []string{"qemu"},
79+
ClusterSize: 0,
80+
NativeFuncs: nativeFuncs,
81+
Architectures: []string{"x86_64"},
8082
})
8183
register.RegisterTest(&register.Test{
8284
Name: "basic.nvme",
@@ -133,7 +135,7 @@ func uefiSecureWithBasicTests(c cluster.TestCluster) {
133135
}
134136

135137
func nvmeBasicTests(c cluster.TestCluster) {
136-
runBasicTests(c, bios, true)
138+
runBasicTests(c, "", true)
137139
}
138140

139141
func runBasicTests(c cluster.TestCluster, firmware string, nvme bool) {

0 commit comments

Comments
 (0)