s390 inhibit if /boot is not on a separate partition #641

vinzenz · 2021-02-01T15:06:53Z

Previously, when the upgrade is performed on a s390x machine with zipl
and /boot is not on a separate partition, the content of /boot got
deleted during the upgrade process. Since the potential solution for
this problem turned out to fail the upgrade for all s390 upgrades, it
has been decided to create an actor that inhibits the upgrade for the
detected scenario that caused the deletion of the /boot content.

This patch introduces a new check actor that inhibits the upgrade when:

The architecture is s390X
/boot is not a mounted partition

In case all of the above is true, the upgrade is inhibited with a
report.

leapp-bot · 2021-02-01T15:09:12Z

Thank you for contributing to the Leapp project!

Please note that every PR needs to comply with the
Leapp Guidelines and must pass all tests in order to be mergable.

If you want to re-run tests or request review, you can use following commands as a comment:

leapp-ci build to run unit tests, copr build and e2e tests in OAMG CI
e2e tests to run unit tests, copr build and end-to-end tests in Murphy CI (OAMG members only) [OLD PIPELINE]
review please to notify leapp developers of review request

Note: In case there are problems with tests not being triggered automatically on new PR/commit or pending for a long time, please consider rerunning the CI by commenting leapp-ci build (might require several comments). If the problem persists, contact leapp-infra.

Rezney · 2021-02-01T16:22:10Z

@AloisMahdal could you please verify this on some s390x?

Rezney

Left couple of suggestions but looks good to me as a temporary measure.

repos/system_upgrade/el7toel8/actors/checknonmountboots390/libraries/checknonmountboots390.py

Previously, when the upgrade is performed on a s390x machine with zipl and /boot is not on a separate partition, the content of /boot got deleted during the upgrade process. Since the potential solution for this problem turned out to fail the upgrade for all s390 upgrades, it has been decided to create an actor that inhibits the upgrade for the detected scenario that caused the deletion of the /boot content. This patch introduces a new check actor that inhibits the upgrade when: - The architecture is s390X - /boot is not a mounted partition In case all of the above is true, the upgrade is inhibited with a report. Signed-off-by: Vinzenz Feenstra <[email protected]>

AloisMahdal · 2021-02-03T16:27:05Z

With

leapp-0.11.1-100.202102021032Z.d9ded67.master.el7_8
leapp-repository-0.12.0-0.202102020940Z.aaa020a.inhibit_s390_non_mount_boot.PR641.el7_8

...upgrade is inhibited when, and only when the system is s390x and /boot is merged:

Risk Factor: high (inhibitor)
Title: Leapp detected known issue related to /boot on s390x architecture
Summary: Due to a bug in the Leapp code, there is a situation when the upgrade process removes content of /boot when the directory is not on a separate partition and the system is running on S390x architecture. To avoid this from happening, we are inhibiting the upgrade process in this release until the issue has been fixed.
Key: b2a53a503ba293a1d8cb87008113a0eb54fcab33
----------------------------------------

IOW, from QE POV the PR is good to merge.

## Packaging - Bump required leapp-framework capability to 1.4 (oamg#642) ## Upgrade handling ### Fixes - Fix comparison of the newest installed and booted kernel (oamg#600) - Fix remediation command for ipa-server removal (oamg#617) - Fix crash due to missing network interfaces during upgrade phases (oamg#625) - Fix error with /boot/efi existing on non-EFI systems (oamg#627) - Fix false positive detection of issue in /etc/default/grub that led into GRUB prompt (oamg#587) - Fix syntax error in upgrade script (oamg#619) - Inhibit upgrade with mount options in fstab that break mounting on RHEL 8 (oamg#639) - Inhibit upgrade on s390x machines with /boot on a separate partition (oamg#641) - Inhibit upgrade if multiple kernel-debug pkgs are installed (oamg#599) - Remove the initial-setup package to avoid it asking for EULA acceptance during upgrade (oamg#626) - Remove the *leapp-resume* service after the *FirstBoot* phase to prevent kill of the leapp process on `systemctl daemon-reload` (oamg#611) ### Enhancements - Add upgrade support for SAP HANA (own upgrade path) (oamg#503) - Allow upgrade with SCA enabled manifest (oamg#615) - Add actors to migrate Quagga to FRR (oamg#467) - Add stable uniq Key id for every dialog (oamg#618) - Respect the *kernel-rt* package (oamg#600) ## Additional changes interesting for devels - Add a possibility to overwrite virtualenv name using `$VENVNAME` (oamg#613) - Update product certificates for RHEL 8.3 GA and 8.4 Beta/HTB (oamg#624) Related leapp release: https://github.com/oamg/leapp/releases/tag/v0.12.0

## Packaging - Bump required leapp-framework capability to 1.4 (#642) ## Upgrade handling ### Fixes - Fix comparison of the newest installed and booted kernel (#600) - Fix remediation command for ipa-server removal (#617) - Fix crash due to missing network interfaces during upgrade phases (#625) - Fix error with /boot/efi existing on non-EFI systems (#627) - Fix false positive detection of issue in /etc/default/grub that led into GRUB prompt (#587) - Fix syntax error in upgrade script (#619) - Inhibit upgrade with mount options in fstab that break mounting on RHEL 8 (#639) - Inhibit upgrade on s390x machines with /boot on a separate partition (#641) - Inhibit upgrade if multiple kernel-debug pkgs are installed (#599) - Remove the initial-setup package to avoid it asking for EULA acceptance during upgrade (#626) - Remove the *leapp-resume* service after the *FirstBoot* phase to prevent kill of the leapp process on `systemctl daemon-reload` (#611) ### Enhancements - Add upgrade support for SAP HANA (own upgrade path) (#503) - Allow upgrade with SCA enabled manifest (#615) - Add actors to migrate Quagga to FRR (#467) - Add stable uniq Key id for every dialog (#618) - Respect the *kernel-rt* package (#600) ## Additional changes interesting for devels - Add a possibility to overwrite virtualenv name using `$VENVNAME` (#613) - Update product certificates for RHEL 8.3 GA and 8.4 Beta/HTB (#624) Related leapp release: https://github.com/oamg/leapp/releases/tag/v0.12.0

vinzenz added the WIP Work In Progress label Feb 1, 2021

vinzenz force-pushed the inhibit-s390-non-mount-boot branch 3 times, most recently from f207e6e to 2112693 Compare February 1, 2021 21:09

vinzenz removed the WIP Work In Progress label Feb 1, 2021

Rezney reviewed Feb 2, 2021

View reviewed changes

repos/system_upgrade/el7toel8/actors/checknonmountboots390/libraries/checknonmountboots390.py Outdated Show resolved Hide resolved

repos/system_upgrade/el7toel8/actors/checknonmountboots390/libraries/checknonmountboots390.py Outdated Show resolved Hide resolved

vinzenz force-pushed the inhibit-s390-non-mount-boot branch from 2112693 to aaa020a Compare February 2, 2021 09:24

Rezney approved these changes Feb 2, 2021

View reviewed changes

pirat89 merged commit ed6a928 into oamg:master Feb 3, 2021

drehak mentioned this pull request Feb 4, 2021

Release 0.13.0 #643

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

s390 inhibit if /boot is not on a separate partition #641

s390 inhibit if /boot is not on a separate partition #641

vinzenz commented Feb 1, 2021 •

edited

Loading

leapp-bot commented Feb 1, 2021

Rezney commented Feb 1, 2021

Rezney left a comment

AloisMahdal commented Feb 3, 2021

s390 inhibit if /boot is not on a separate partition #641

s390 inhibit if /boot is not on a separate partition #641

Conversation

vinzenz commented Feb 1, 2021 • edited Loading

leapp-bot commented Feb 1, 2021

Thank you for contributing to the Leapp project!

Rezney commented Feb 1, 2021

Rezney left a comment

Choose a reason for hiding this comment

AloisMahdal commented Feb 3, 2021

vinzenz commented Feb 1, 2021 •

edited

Loading