Skip to content
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

Fix migration sp5 #684

Merged
merged 4 commits into from
Apr 26, 2023
Merged

Fix migration sp5 #684

merged 4 commits into from
Apr 26, 2023

Conversation

jreidinger
Copy link
Member

@jreidinger jreidinger commented Apr 25, 2023

Problem

User selection was ignored during migration.

Solution

Drop legacy code for SLE11 migration and reset proposal only if it is forced.

Testing

  • manually

@jreidinger jreidinger changed the base branch from master to SLE-15-SP5 April 25, 2023 20:26
@@ -226,7 +226,8 @@ def propose_for_update(force_reset)
# old one is grub2, but mismatch of EFI and non-EFI (bsc#1081355)
elsif old_bootloader =~ /grub2/ && old_bootloader != current_bl.name
raise MismatchBootloader.new(old_bootloader, current_bl.name)
elsif !current_bl.proposed? || force_reset
elsif force_reset
log.warn "forced proposel during migration. Will change existing config"
Copy link
Contributor

@shundhammer shundhammer Apr 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: s/proposel/proposal/

Are we also going to tell the user about this forced reset?

@coveralls
Copy link

Coverage Status

Coverage: 87.928% (-0.4%) from 88.338% when pulling fd6780d on fix_migration_sp5 into d5ed9d7 on SLE-15-SP5.

Copy link
Contributor

@shundhammer shundhammer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jreidinger jreidinger merged commit 68e28c2 into SLE-15-SP5 Apr 26, 2023
@jreidinger jreidinger deleted the fix_migration_sp5 branch April 26, 2023 08:13
@yast-bot
Copy link
Contributor

✔️ Internal Jenkins job #754 successfully finished
✔️ Created IBS submit request #296449

@jreidinger jreidinger mentioned this pull request Apr 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants