Remove Workaround for bsc#1070233 #4973
Conversation
Jiawei517
changed the title
Jiawei517
changed the title
|
@mitiao Thanks for help, I have rebase this commit, please help remove [WIP] label |
| @@ -50,6 +45,13 @@ sub run { | |||
| assert_screen 'booting-section-selected'; | |||
| send_key 'ret'; | |||
| } | |||
|
|
|||
| # Config bootloader is not be supported durning an upgrade | |||
|
Please add a corresponding openSUSE needle. See latest failure in https://openqa.opensuse.org/tests/668866 And for the future: Please don't forget about openSUSE :) |
|
@okurz needle for openSUSE os-autoinst/os-autoinst-needles-opensuse#364 |
| @@ -50,6 +45,13 @@ sub run { | |||
| assert_screen 'booting-section-selected'; | |||
| send_key 'ret'; | |||
| } | |||
|
|
|||
| # Config bootloader is not be supported during an upgrade | |||
| if (get_var('UPGRADE') && (!is_sle('<15') || !is_leap('<15.0'))) { | |||
There was a problem hiding this comment.
What's about using is_sle feature for version comparison instead of negation? E.g.
is_sle('>=15') || is_leap('>=15.0') || is_tumbleweedI guess we will need is_tumbleweed, as current expression will return true in case UPGRADE is set and distri is TW. WDYT?
There was a problem hiding this comment.
Good idea, I have rebased the code.
- OpenSUSE verify run: openqa-apac1.suse.de/tests/897#step/disable_grub_timeout/13
There was a problem hiding this comment.
Hm, overall I prefer to avoid is_tumbleweed as that is not really a good version to check for. Rather we should accept the TW behaviour always as the default and handle exceptions differently, e.g. in this case handle the is_sle('<15') || is_leap('<15') case as exception and accept everything else as default.
If you agree, please change that. If you do not want to change this in this PR then please ping me or anyone else to merge directly as is.
Jiawei517
force-pushed
the
ipsec
branch
2 times, most recently
from
43b7e21
to
06d96de
Compare
Bug 1070233 has been fixed, remove workaround
Bug 1070233 has been fixed, remove workaround