Skip to content

Commit 705c7d1

Browse files
committed
vars/kola: drop --basic-qemu-scenarios
The argument for --basic-qemu-scenarios has been removed. The tests invoked by it are now formal kola tests. skipSecureBoot now translates to --denylist-test *.uefi-secure See coreos/coreos-assembler#3652
1 parent 1a7a4ba commit 705c7d1

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

vars/kola.groovy

+2-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// arch: string -- the target architecture
88
// cosaDir: string -- cosa working directory
99
// parallel: integer -- number of tests to run in parallel (default: # CPUs)
10-
// skipBasicScenarios boolean -- skip basic qemu scenarios
1110
// skipSecureBoot boolean -- skip secureboot tests
1211
// skipUpgrade: boolean -- skip running `cosa kola --upgrades`
1312
// build: string -- cosa build ID to target
@@ -116,15 +115,8 @@ def call(params = [:]) {
116115
ids += id
117116
runKola(id, 'run', "--parallel=${parallel} ${args} ${extraArgs}")
118117
} else {
119-
// basic run
120-
if (!params['skipBasicScenarios']) {
121-
id = marker == "" ? "kola-basic" : "kola-basic-${marker}"
122-
ids += id
123-
def skipSecureBootArg = ""
124-
if (params['skipSecureBoot']) {
125-
skipSecureBootArg = "--skip-secure-boot"
126-
}
127-
runKola(id, 'run', "--basic-qemu-scenarios ${skipSecureBootArg}")
118+
if (params['skipSecureBoot']) {
119+
args += " --denylist-test *.uefi-secure"
128120
}
129121
// normal run (without reprovision tests because those require a lot of memory)
130122
id = marker == "" ? "kola" : "kola-${marker}"

0 commit comments

Comments
 (0)