Skip to content

Commit fb3ec40

Browse files
committed
vars/kola: deprecate --basic-qemu-scenarios, --skipSecureBoot
The argument for --basic-qemu-scenarios, and --skipSecureBoot have been deprecated. Depending on the version of cosa, the tests that would be skipped by these args are now formal kola tests. And to skip them you can use --denylist-test commands. skipSecureBoot now translates to --denylist-test *.uefi-secure
1 parent 0e60cc4 commit fb3ec40

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

vars/kola.groovy

+12-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
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
11-
// skipSecureBoot boolean -- skip secureboot tests
10+
// skipBasicScenarios boolean -- skip basic qemu scenarios, as of cosa v0.17.0 these tests are part of kola. consquently this option is deprecated
11+
// skipSecureBoot boolean -- skip secureboot tests, as of cosa v0.17.0 these tests are part of kola. consquently this option is deprecated
1212
// skipUpgrade: boolean -- skip running `cosa kola --upgrades`
1313
// build: string -- cosa build ID to target
1414
// platformArgs: string -- platform-specific kola args (e.g. '-p aws --aws-ami ...`)
@@ -117,12 +117,19 @@ def call(params = [:]) {
117117
runKola(id, 'run', "--parallel=${parallel} ${args} ${extraArgs}")
118118
} else {
119119
// basic run
120-
if (!params['skipBasicScenarios']) {
120+
// Check if kola has old or new basic scenarios
121+
def out = shwrapCapture("""
122+
cd ${cosaDir}
123+
cosa kola list
124+
""")
125+
def newBasic.nvmeExist = out.readLines().any { it =~ /basic\.nvme/ }
126+
127+
if (!params['skipBasicScenarios'] && !exists) {
121128
id = marker == "" ? "kola-basic" : "kola-basic-${marker}"
122129
ids += id
123130
def skipSecureBootArg = ""
124-
if (params['skipSecureBoot']) {
125-
skipSecureBootArg = "--skip-secure-boot"
131+
if (params['skipSecureBoot'] && !exists) {
132+
skipSecureBootArg = "--skip-secure-boot"
126133
}
127134
runKola(id, 'run', "--basic-qemu-scenarios ${skipSecureBootArg}")
128135
}

0 commit comments

Comments
 (0)