Don't Block in AutoYaST Upgrade with Reboot Message [master]

[shundhammer]

Target Branch

This is the master / Factory version of #1119 / #1120. It was originally meant to be a merge of the SLE-15-SP7 / SP6 version, but this commit somehow got lost in the merging process; so this is a cherry-pick of that commit.

Bugzilla

https://bugzilla.suse.com/show_bug.cgi?id=1181625

Trello

https://trello.com/c/jxGwssL6/

Problem

In certain situations, an AutoYaST upgrade may block with a pop-up dialog "The system will reboot now" message that does not continue after a timeout as it should; the user needs to confirm it interactively which is against the idea of an auto-upgrade.

Cause

The pop-up is suppressed only in Mode.autoinst, not also in Mode.autoupgrade.

Fix

Instead of just checking for Mode.autoinst, check for Mode.auto which includes both Mode.autoinst and Mode.autoupgrade.

See also https://github.com/yast/yast-yast2/blob/master/library/general/src/modules/Mode.rb#L283-L286

Related PRs

• Original PR for SLE-15-SP5: #1119
• Merge to SLE-15-SP6: #1120
• Merge to SLE-15-SP7: Not needed since SP7 was branched off SP6 after this was merged.

[coveralls]

coverage: 41.105%. remained the same when pulling 5dc20a9f0f8a0749c4970f2a5cd2717ffe6bf436 on huha-ay-upgrade-master into 6737d9ffa3b8ffc7ed48b4b2c5ece544f87b5583 on master.

[github-actions[bot]]

:white_check_mark: Autosubmission job #10789393566 successfully finished :white_check_mark: Created submit request #1199846