Skip to content

Commit

Permalink
vars/kola: drop --basic-qemu-scenarios
Browse files Browse the repository at this point in the history
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
  • Loading branch information
prestist committed Nov 14, 2023
1 parent 1a7a4ba commit 705c7d1
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions vars/kola.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
// 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
// skipUpgrade: boolean -- skip running `cosa kola --upgrades`
// build: string -- cosa build ID to target
Expand Down Expand Up @@ -116,15 +115,8 @@ def call(params = [:]) {
ids += id
runKola(id, 'run', "--parallel=${parallel} ${args} ${extraArgs}")
} else {
// basic run
if (!params['skipBasicScenarios']) {
id = marker == "" ? "kola-basic" : "kola-basic-${marker}"
ids += id
def skipSecureBootArg = ""
if (params['skipSecureBoot']) {
skipSecureBootArg = "--skip-secure-boot"
}
runKola(id, 'run', "--basic-qemu-scenarios ${skipSecureBootArg}")
if (params['skipSecureBoot']) {
args += " --denylist-test *.uefi-secure"
}
// normal run (without reprovision tests because those require a lot of memory)
id = marker == "" ? "kola" : "kola-${marker}"
Expand Down

0 comments on commit 705c7d1

Please sign in to comment.