|
7 | 7 | // arch: string -- the target architecture
|
8 | 8 | // cosaDir: string -- cosa working directory
|
9 | 9 | // 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 |
12 | 12 | // skipUpgrade: boolean -- skip running `cosa kola --upgrades`
|
13 | 13 | // build: string -- cosa build ID to target
|
14 | 14 | // platformArgs: string -- platform-specific kola args (e.g. '-p aws --aws-ami ...`)
|
@@ -117,12 +117,19 @@ def call(params = [:]) {
|
117 | 117 | runKola(id, 'run', "--parallel=${parallel} ${args} ${extraArgs}")
|
118 | 118 | } else {
|
119 | 119 | // 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) { |
121 | 128 | id = marker == "" ? "kola-basic" : "kola-basic-${marker}"
|
122 | 129 | ids += id
|
123 | 130 | def skipSecureBootArg = ""
|
124 |
| - if (params['skipSecureBoot']) { |
125 |
| - skipSecureBootArg = "--skip-secure-boot" |
| 131 | + if (params['skipSecureBoot'] && !exists) { |
| 132 | + skipSecureBootArg = "--skip-secure-boot" |
126 | 133 | }
|
127 | 134 | runKola(id, 'run', "--basic-qemu-scenarios ${skipSecureBootArg}")
|
128 | 135 | }
|
|
0 commit comments