Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vars/kola: drop --basic-qemu-scenarios #154

Merged
merged 1 commit into from
Mar 11, 2024
Merged

vars/kola: drop --basic-qemu-scenarios #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions vars/kola.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// 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
// skipBasicScenarios boolean -- skip basic qemu scenarios (ignored if cosa has https://github.com/coreos/coreos-assembler/pull/3652)
// skipSecureBoot boolean -- skip secureboot tests
prestist marked this conversation as resolved.
Show resolved Hide resolved
// skipUpgrade: boolean -- skip running `cosa kola --upgrades`
// build: string -- cosa build ID to target
Expand Down Expand Up @@ -116,15 +116,26 @@ 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 = ""
// Check if the basic tests are registered kola tests or not.
def availableTests = shwrapCapture("kola list --json | jq -r '.[].Name'").split()
// This essentially checks if the running has cosa https://github.com/coreos/coreos-assembler/pull/3652
def basicScenariosBuiltIn = "basic.nvme" in availableTests

if (basicScenariosBuiltIn) {
if (params['skipSecureBoot']) {
skipSecureBootArg = "--skip-secure-boot"
// skip secureboot tests using kola's denylist
args += "--denylist-test *.uefi-secure"
}
} else {
jlebon marked this conversation as resolved.
Show resolved Hide resolved
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}")
}
runKola(id, 'run', "--basic-qemu-scenarios ${skipSecureBootArg}")
}
// normal run (without reprovision tests because those require a lot of memory)
id = marker == "" ? "kola" : "kola-${marker}"
Expand Down