Switch Tumbleweed to use grub2-bls #22661
Conversation
|
Great PR! Please pay attention to the following items before merging: Files matching
This is an automatically generated QA checklist based on modified files. |
foursixnine
force-pushed
the
newdefaultbootloader-grub2-bls
branch
5 times, most recently
from
db131ed to
4912305
Compare
| return 'grub2' if (get_var('FLAVOR', '') =~ /(MicroOS-SelfInstall|MicroOS-Image|Image-ContainerHost|JeOS-for-kvm-and-xen|JeOS-for-OpenStack-Cloud)$/); | ||
| return 'systemd-boot' if is_microos; | ||
| return 'grub2' if is_slowroll; | ||
| return 'grub2-bls' if (!is_sle || !is_leap); |
There was a problem hiding this comment.
this "if" will always be true. Everything will always be "not sle" or "not leap" except for "SleLeap" which is both SLE and Leap :)
There was a problem hiding this comment.
I can put is_tubleweed :D
There was a problem hiding this comment.
Our tests should always consider openSUSE Tumbleweed as the default product without a version. That means any differing behaviour should have an explicit exclude rule for the "older products" and potentially an explanation why the behaviour should differ. You can try to negate the logic check.
See https://github.com/os-autoinst/os-autoinst-distri-opensuse/blob/master/CONTRIBUTING.md#coding-style for more details
My point was: Instead of !is_sle || !is_leap you likely want !is_sle && !is_leap
There was a problem hiding this comment.
My point was: Instead of
Then make the suggestion, because from your comment I could not figure out what did you want to say. I'll check again when I need to touch that code
There was a problem hiding this comment.
| return 'grub2-bls' if (!is_sle || !is_leap); | |
| return 'grub2-bls' if !is_sle && !is_leap; |
| if (is_bootloader_grub2) { | ||
| $testapi::distri->get_bootloader_settings()->disable_grub_timeout(); | ||
| } else { | ||
| $testapi::distri->get_bootloader_settings()->bls_disable_timeout(); | ||
| } |
There was a problem hiding this comment.
How about a new function in the "distri" called "disable_bootloader_timeout" and do the distinction in there?
There was a problem hiding this comment.
Lets keep it as is for now
foursixnine
force-pushed
the
newdefaultbootloader-grub2-bls
branch
from
4912305 to
990354e
Compare
foursixnine
force-pushed
the
newdefaultbootloader-grub2-bls
branch
from
990354e to
b828570
Compare
Ticket https://progress.opensuse.org/issues/184861
This should be part of #22576 (for now, see that PR for more context)