-
Notifications
You must be signed in to change notification settings - Fork 168
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.
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
mantle/kola: copy basic tests into formal kola workflow #3652
Conversation
hmm, I might have missed it but I did not see what triggers the CI to run If someone could point me to it I can make a pr and remove it. |
We also need to touch coreos-ci-lib |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only a small comment, overall LGTM
855ab6b
to
a3daccd
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
awesome; made a pr. thank you |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This LGTM generally. I'm curious if we need 6 kola tests though. I believe the original logic produced only 4 basic tests:
x86_64
- basic (nvme)
- uefi
- uefi-secure
- multi-arch
- basic (not-nvme)
Trying to summarize what we'll run:
So the question is: Should we really run all 6 combination for the test matrix on x86_64 or just a subset of those for nvme? For now we were only running basic (nvme), uefi, uefi-secure as Michael said. Shouldn't we run uefi & uefi-secure boot on aarch64 as well? Feels like that should be working. EDIT: Re-reading the PR, this runs all 6 ones for x86_64 so should be OK. |
I'm good with that. It makes sense that we would test bios, uefi, and uefi-secure with both nvme and non-nvme conditions on x86_64. So we just need to make sure that the nvme and uefi/uefi-secure tests dont run on other arches.
Unless we want these ones to run on aarch64. |
If thats the case It sounds like I need to update the field |
a3daccd
to
e3fc4fb
Compare
Yes, I believe that should do it! |
The argument for --basic-qemu-scenarios has been removed. The tests invoked by it are now formal kola tests. See coreos/coreos-assembler#3652
The argument for --basic-qemu-scenarios has been removed. The tests invoked by it are now formal kola tests. See coreos/coreos-assembler#3652
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So overall I think there are at least two main ways I see we can approach this:
- Have knobs as part of
register.Test
to say e.g. which firmware to use for the test. - Use
ClusterSize: 0
and manually bring up the VMs ourselves. This is done in a bunch of QEMU tests already where we need more control over the VM settings. (Do agit grep 'ClusterSize: \+0'
to see them.)
Leaning towards the latter to avoid having to add a bunch more knobs in register.Test
. You can have a single function that sets up the tests and takes arguments for the variable knobs and each test calls that one function with the different combinations we want (see the luks.*
tests for an example of this pattern).
Re. the combinations, my vote is to match the current coverage and then we can extend it in the future. But not strongly against either!
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
e3fc4fb
to
f9e2571
Compare
Ok thank you for the pointer. I am looking into doing this. |
f9e2571
to
f854f01
Compare
f854f01
to
a899889
Compare
/retest |
Hmm, the conditional at https://github.com/openshift/os/blob/59526550b3a4a466c6354cbf2455eeabe1122d1c/ci/prow-entrypoint.sh#L129 is failing for some reason. I wonder if somehow this isn't running with the changes from this PR. I guess we can easily test that. |
cfe251f
to
9905a54
Compare
`cmd-kola` has non-conformed basic kola tests. These tests do not benefit from the supporting functionality around kola test's such as denylisting or other functionality. reduce `cmd-kola` and conform the basic kola tests. fixes coreos#3418 co-authored-by: AdamOBrien <[email protected]>
9905a54
to
a6ad567
Compare
OK, finally got to the bottom of the CI issue. Should be fixed by openshift/os#1485. |
✅ 👀! I see green! |
Thank you, holy crap. Talk about entangled. |
Also, I noticed that you changed it from uefi.secure to uefi-secure in the latest push https://github.com/coreos/coreos-assembler/compare/9905a54445f384b124a8e83fe4f12e0dff2f8bb1..a6ad56783a796f4baa698e8d4c842532765b6482 Thank you for catching that. |
a6ad567
to
2f44daa
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, finally green CI here! 🎉
I think we can merge this now, but to be safe let's wait until coreos/fedora-coreos-streams#886 is past the build and test stages.
we're past that point now! merging |
Next steps on this:
|
This changed form with coreos/coreos-assembler#3652
This changed form with coreos/coreos-assembler#3652
Thanks Steven and Jonathan for persisting with this PR! |
Update kola denylist with the new tests names. See: openshift#1237 See: coreos/coreos-assembler#3652
openshift/os: openshift/os#1489 |
Commit 81e5134 relies on logic in the Prow scripts to skip the Secure Boot basic test, but that logic does not exist in the prod pipelines. So we still need to snooze the basic test for now. Once coreos/coreos-assembler#3652 is in, we should be able to clean this up. Fixes 81e5134 ("kola-denylist: Do not snooze basic tests anymore").
This changed form with coreos/coreos-assembler#3652
cmd-kola
has non-conformed basic kola tests. These tests do not benefit from the supporting functionality around kola test's such as denylisting or other functionality. reducecmd-kola
and conform the basic kola tests.fixes #3418
This is a small rework on an already existing; but stale pr. Cherry-picked and made a few touches.