Skip to content

Commit

Permalink
vars/kola: deprecate --basic-qemu-scenarios, --skipSecureBoot
Browse files Browse the repository at this point in the history
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
  • Loading branch information
prestist committed Feb 29, 2024
1 parent 0e60cc4 commit 6626e7e
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions vars/kola.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
// arch: string -- the target architecture
// cosaDir: string -- cosa working directory
// parallel: integer -- number of tests to run in parallel (default: # CPUs)
// skipBasicScenarios boolean -- skip basic qemu scenarios
// skipSecureBoot boolean -- skip secureboot tests
// skipBasicScenarios boolean -- skip basic qemu scenarios, as of cosa v0.17.0 these tests are part of kola. consquently this option is deprecated
// skipSecureBoot boolean -- skip secureboot tests, as of cosa v0.17.0 these tests are part of kola. consquently this option is deprecated
// skipUpgrade: boolean -- skip running `cosa kola --upgrades`
// build: string -- cosa build ID to target
// platformArgs: string -- platform-specific kola args (e.g. '-p aws --aws-ami ...`)
Expand Down Expand Up @@ -116,13 +116,20 @@ def call(params = [:]) {
ids += id
runKola(id, 'run', "--parallel=${parallel} ${args} ${extraArgs}")
} else {
// basic run
if (!params['skipBasicScenarios']) {
// basic run
// Check if kola has old or new basic scenarios
def out = shwrapCapture("""
cd ${cosaDir}
cosa kola list
""")
def newBasic.nvmeExist = out.readLines().any { it =~ /basic\.nvme/ }

if (!params['skipBasicScenarios'] && !exists) {
id = marker == "" ? "kola-basic" : "kola-basic-${marker}"
ids += id
def skipSecureBootArg = ""
if (params['skipSecureBoot']) {
skipSecureBootArg = "--skip-secure-boot"
if (params['skipSecureBoot'] && !exists) {
skipSecureBootArg = "--skip-secure-boot"
}
runKola(id, 'run', "--basic-qemu-scenarios ${skipSecureBootArg}")
}
Expand Down

0 comments on commit 6626e7e

Please sign in to comment.