vars/kola: drop --basic-qemu-scenarios
#154
Conversation
prestist
requested review from
jlebon,
ravanelli,
mike-nguyen,
gursewak1997 and
dustymabe
as code owners
|
@prestist We also need to drop it on: @jlebon Are you aware about other repositories using it too? |
prestist
force-pushed
the
make-kola-changes
branch
from
6cfeb99 to
6b047cc
Compare
Ahhhh thank you :) |
prestist
force-pushed
the
make-kola-changes
branch
from
6b047cc to
0b11c3c
Compare
prestist
force-pushed
the
make-kola-changes
branch
from
0b11c3c to
705c7d1
Compare
prestist
force-pushed
the
make-kola-changes
branch
2 times, most recently
from
6626e7e to
fb3ec40
Compare
vars/kola.groovy
Outdated
| // 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/ } |
There was a problem hiding this comment.
Maybe something like:
| // 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/ } | |
| // Check if kola has old or new basic scenarios | |
| def availableTests = shwrapCapture("kola list --json | jq -r '.[].Name'").split() | |
| def basicScenariosBuiltIn = "basic.nvme" in availableTests |
?
prestist
force-pushed
the
make-kola-changes
branch
3 times, most recently
from
7e7a251 to
d645ea8
Compare
prestist
force-pushed
the
make-kola-changes
branch
from
d645ea8 to
2c140ed
Compare
vars/kola.groovy
Outdated
| if (basicScenariosBuiltIn) { | ||
| if (params['skipSecureBoot']) { | ||
| // skip secureboot tests using kola's denylist | ||
| runKola(id, 'run', "--denylist-test *.uefi-secure") |
There was a problem hiding this comment.
We shouldn't run kola here, just e.g. modify args to add the --denylist-test flag.
vars/kola.groovy
Outdated
| id = marker == "" ? "kola-basic" : "kola-basic-${marker}" | ||
| ids += id |
There was a problem hiding this comment.
This should only be done if we actually do a separate basic scenarios kola run (so in the else block below).
prestist
force-pushed
the
make-kola-changes
branch
2 times, most recently
from
589b0c9 to
f3ab9b5
Compare
|
Build with new cosa => https://jenkins-fedora-coreos-pipeline.apps.ocp.stg.fedoraproject.org/job/build/132/ |
There was a problem hiding this comment.
One final comment, but LGTM otherwise.
Build with new cosa => jenkins-fedora-coreos-pipeline.apps.ocp.stg.fedoraproject.org/job/build/132
That build no-op'ed so we didn't actually get to see the new logic here kick in in the new cosa case. If you've verified that path works already in another build, WFM.
vars/kola.groovy
Outdated
| def skipSecureBootArg = "" | ||
| // Check if the basic tests are registered kola tests or not. | ||
| def availableTests = shwrapCapture("kola list --json | jq -r '.[].Name'").split() | ||
| // This essentually checks if the running has https://github.com/coreos/coreos-assembler/pull/3652 |
There was a problem hiding this comment.
| // This essentually checks if the running has https://github.com/coreos/coreos-assembler/pull/3652 | |
| // This essentially checks if the running cosa has https://github.com/coreos/coreos-assembler/pull/3652 |
There was a problem hiding this comment.
Wow, I guess my spell check is not working :? anyways thank you for seeing that, we are lucky I did not have more lol, I depend on my spellcheck a bit too much.
The new logic was tested here there have been updates to the other branch of logic (old style) since this though. So I will replay with a force this time, to be sure; |
The argument for --basic-qemu-scenarios has 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
prestist
force-pushed
the
make-kola-changes
branch
from
f3ab9b5 to
ed73e05
Compare
The argument for --basic-qemu-scenarios has been removed. The tests invoked by it are now formal kola tests.
See coreos/coreos-assembler#3652