-
Notifications
You must be signed in to change notification settings - Fork 144
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
add Satellite el7toel8 upgrade actor #733
Conversation
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.
Please open ticket in case you experience technical problem with the CI. (RH internal only) 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. |
repos/system_upgrade/el7toel8/actors/satelliteupgrader/actor.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/satelliteupgrader/actor.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/satelliteupgrader/actor.py
Outdated
Show resolved
Hide resolved
b2191cb
to
315c934
Compare
repos/system_upgrade/el7toel8/actors/satelliteupgradechecks/actor.py
Outdated
Show resolved
Hide resolved
7f65938
to
54f25fd
Compare
repos/system_upgrade/el7toel8/actors/satelliteupgradefacts/actor.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/satelliteupgradechecks/actor.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/satelliteupgrader/actor.py
Outdated
Show resolved
Hide resolved
This PR has been linked in issue tracker (#OAMG-5855). |
261e8ad
to
6d36dff
Compare
repos/system_upgrade/el7toel8/actors/satelliteupgradefacts/actor.py
Outdated
Show resolved
Hide resolved
6d36dff
to
7af6853
Compare
repos/system_upgrade/el7toel8/actors/satelliteupgradedatamigration/actor.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/satelliteupgradefacts/actor.py
Outdated
Show resolved
Hide resolved
0b12411
to
fb70cb6
Compare
c08f17a
to
1e14b89
Compare
a1a7ecb
to
0920798
Compare
7d7a244
to
c289250
Compare
267f374
to
c023abd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't see anything else, just couple of super minor things. lgtm
self.produce(RpmTransactionTasks(to_install=additional_rpms)) | ||
|
||
if local_postgresql: | ||
scl_psql_path = '/var/opt/rh/rh-postgresql12/lib/pgsql/data/' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically you could create a shared library to share code between 2 actors (like repos/system_upgrade/el7toel8/libraries/satelliteupgradeutils.py
and then import it as import leapp.libraries.common.satelliteupgradeutils as lib
). But for one single constant that is used for report generation only this may be an overkill, so up to you.
Anyway, could you please make this string a constant
POSTGRESQL_SCL_DATA_PATH = '/var/opt/rh/rh-postgresql12/lib/pgsql/data/'
as well?
repos/system_upgrade/el7toel8/actors/satelliteupgradecheck/actor.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/satelliteupgradecheck/actor.py
Outdated
Show resolved
Hide resolved
7eadd7c
to
d76abc2
Compare
Thanks @fernflower and @vinzenz! |
/rerun |
@evgeni Thanks a lot for all your hard work on this PR! Good Job! Let's wait for the e2e test results and then we can merge it. |
Copr build succeeded: https://copr.fedorainfracloud.org/coprs/build/3597436 |
Testing Farm request for 7to8/3597436 regression testing has been created. Once finished, results should be available here. |
Testing Farm request for 8to9/3597436 regression testing has been created. Once finished, results should be available here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, thanks for your work and patience.
d76abc2
to
d1eabf0
Compare
hah, dropped one last FIXME, which I forgot was still in there \o/ |
/rerun |
Copr build succeeded: https://copr.fedorainfracloud.org/coprs/build/3597587 |
Testing Farm request for 7to8/3597587 regression testing has been created. Once finished, results should be available here. |
Testing Farm request for 8to9/3597587 regression testing has been created. Once finished, results should be available here. |
The following test for 7to8 failed: /tests/plans/morf/bind/morf-leapp-bind But I don't think the output looks related to the changes in this PR? |
No, it's not related. Awesome work, merging |
## Packaging - Requires leapp-framework >= 2.2 - Bump leapp-framework-dependencies to 5 ## Upgrade handling ### Fixes - Fallback to /etc/leapp/repos.d if missing config option instead of using cwd (oamg#849) - Filter out unrelated PES data for the particular IPU path (oamg#789) - Fix bug with existing symlink when migrating YUM configuration files (oamg#811) - Fix creating invalid answerfile in "authselectcheck" actor (oamg#748) - Fix generating of instructions/data for the leapp DNF plugin during the IPU (oamg#754) - Fix generating the target initramfs when additional files and dracut modules are requested to be added (oamg#838) - Fix getting device attribute through udev on Python 3 (oamg#758) - Fix parsing of sysctl output (oamg#793) - Fix processing of merge events from PES data (oamg#768, oamg#825) - Fix random crashes when printing DNF output (oamg#745) - Fix scanning "/etc/default/grub" with empty line (oamg#845) - Fix scanning information about mounted devices (oamg#711) - Fix severities in the "targetuserspacecreator" actor (oamg#751) - Fix the "rerun" command after adding the "--channel" option (oamg#750) - Fix the execution order for the dnf dry run actor (oamg#801) - Skip checking the flavor and target_version upon leapp --resume (oamg#781) - Use more accurate tense in the SELinux messaging (oamg#614) ### Enhancements - Introduce IPU for RHEL 8 to RHEL 9 \o/ - New upgrade paths for RHEL with SAP HANA (oamg#834) - Changed upgrade paths: -- RHEL 7.9 -> [8.4, 8.6] (default: 8.6) -- RHEL 8.6 -> 9.0 -- RHEL with SAP 7.9 -> [8.2, 8.6] (default: 8.2) -- RHEL with SAP 8.6 -> 9.0 - Add 8.6, 9.0 Beta & GA product certificates (oamg#776, oamg#794) - Add detection of enabled YUM & DNF plugins (oamg#703) - Bind the /run/lock dir into the container in the upgrade initramfs env (oamg#831) - Enable RHEL 8 to RHEL 9 upgrades on RHUI for AWS (oamg#828) - Enhance handling selinux related stuff for 8 to 9 upgrade (oamg#749) - Generalize checking of device drivers (oamg#835) - Improve the performance of the leapp execution for "pre first reboot" phases (oamg#741) - Introduce DNFWorkarounds to register scripts to be executed before DNF run (oamg#841) - Introduce DNF modularity support (oamg#672, oamg#799) - Introduce the --report-schema option to control the version of the generated report format (oamg#696) - Introduce the --target option to specify the version of the target system (oamg#780) - Provide the LEAPP_IPU_IN_PROGRESS envar during the IPU (oamg#830) - [IPU 7 -> 8]: Add CUPS actors - cupsscanner, cupscheck, cupsmigrate (oamg#181) - [IPU 7 -> 8]: Convert restrictions with IPv6 mask in "migratentp" actor (oamg#756) - [IPU 7 -> 8]: Handle upgrading Satellite instances (oamg#733) - [IPU 7 -> 8]: Warn about docker deprecation when installed - [IPU 7 -> 8]: Zipl: Inhibit if boot entries share the same kernel image (oamg#816) - [IPU 7 -> 8]: bind configuration check (oamg#521) - [IPU 8 -> 9]: Add actor that ensures ifcfg files work in el9 (oamg#839) - [IPU 8 -> 9]: Add actor that scans for deprecated network settings (oamg#842) - [IPU 8 -> 9]: Add inhibitor FirewalldCheckServiceTftpClient (oamg#792) - [IPU 8 -> 9]: Add inihibtor FirewalldCheckAllowZoneDrifting (oamg#777) - [IPU 8 -> 9]: Add kpatch actor to handle live kernel patching during IPU (oamg#837) - [IPU 8 -> 9]: Add mariadbcheck actor to link upgrade documentation (oamg#836) - [IPU 8 -> 9]: Add postgresqlcheck actor to link upgrade documentation (oamg#802) - [IPU 8 -> 9]: Add scan & checks for VDO devices (oamg#821) - [IPU 8 -> 9]: Apply a new way of disabling SELinux (oamg#769) - [IPU 8 -> 9]: Check SSSD configuration for changes in RHEL9 and report them (oamg#732) - [IPU 8 -> 9]: Check the existence of the custom network-scripts (oamg#729) - [IPU 8 -> 9]: Provide upgrade inhibitor for ipa-server (oamg#765) ## Additional changes interesting for devels - Move target release and flavor specification to a separate lib (oamg#753) - Refactor "transactionworkarounds" actor and fix tests (oamg#759) - Several actors moved to the system_upgrade/common repository (oamg#800, oamg#803, oamg#805, oamg#833)
## Packaging - Requires leapp-framework >= 2.2 - Bump leapp-framework-dependencies to 5 ## Upgrade handling ### Fixes - Fallback to /etc/leapp/repos.d if missing config option instead of using cwd (oamg#849) - Filter out unrelated PES data for the particular IPU path (oamg#789) - Fix bug with existing symlink when migrating YUM configuration files (oamg#811) - Fix creating invalid answerfile in "authselectcheck" actor (oamg#748) - Fix generating of instructions/data for the leapp DNF plugin during the IPU (oamg#754) - Fix generating the target initramfs when additional files and dracut modules are requested to be added (oamg#838) - Fix getting device attribute through udev on Python 3 (oamg#758) - Fix parsing of sysctl output (oamg#793) - Fix processing of merge events from PES data (oamg#768, oamg#825) - Fix random crashes when printing DNF output (oamg#745) - Fix scanning "/etc/default/grub" with empty line (oamg#845) - Fix scanning information about mounted devices (oamg#711) - Fix severities in the "targetuserspacecreator" actor (oamg#751) - Fix the "rerun" command after adding the "--channel" option (oamg#750) - Fix the execution order for the dnf dry run actor (oamg#801) - Skip checking the flavor and target_version upon leapp --resume (oamg#781) - Use more accurate tense in the SELinux messaging (oamg#614) ### Enhancements - Introduce IPU for RHEL 8 to RHEL 9 \o/ - New upgrade paths for RHEL with SAP HANA (oamg#834) - Changed upgrade paths: -- RHEL 7.9 -> [8.4, 8.6] (default: 8.6) -- RHEL 8.6 -> 9.0 -- RHEL with SAP 7.9 -> [8.2, 8.6] (default: 8.2) -- RHEL with SAP 8.6 -> 9.0 - Add 8.6, 9.0 Beta & GA product certificates (oamg#776, oamg#794) - Add detection of enabled YUM & DNF plugins (oamg#703) - Bind the /run/lock dir into the container in the upgrade initramfs env (oamg#831) - Enable RHEL 8 to RHEL 9 upgrades on RHUI for AWS (oamg#828) - Enhance handling selinux related stuff for 8 to 9 upgrade (oamg#749) - Generalize checking of device drivers (oamg#835) - Improve the performance of the leapp execution for "pre first reboot" phases (oamg#741) - Introduce DNFWorkarounds to register scripts to be executed before DNF run (oamg#841) - Introduce DNF modularity support (oamg#672, oamg#799) - Introduce the --report-schema option to control the version of the generated report format (oamg#696) - Introduce the --target option to specify the version of the target system (oamg#780) - Provide the LEAPP_IPU_IN_PROGRESS envar during the IPU (oamg#830) - [IPU 7 -> 8]: Add CUPS actors - cupsscanner, cupscheck, cupsmigrate (oamg#181) - [IPU 7 -> 8]: Convert restrictions with IPv6 mask in "migratentp" actor (oamg#756) - [IPU 7 -> 8]: Handle upgrading Satellite instances (oamg#733) - [IPU 7 -> 8]: Warn about docker deprecation when installed - [IPU 7 -> 8]: Zipl: Inhibit if boot entries share the same kernel image (oamg#816) - [IPU 7 -> 8]: bind configuration check (oamg#521) - [IPU 8 -> 9]: Add actor that ensures ifcfg files work in el9 (oamg#839) - [IPU 8 -> 9]: Add actor that scans for deprecated network settings (oamg#842) - [IPU 8 -> 9]: Add inhibitor FirewalldCheckServiceTftpClient (oamg#792) - [IPU 8 -> 9]: Add inihibtor FirewalldCheckAllowZoneDrifting (oamg#777) - [IPU 8 -> 9]: Add kpatch actor to handle live kernel patching during IPU (oamg#837) - [IPU 8 -> 9]: Add mariadbcheck actor to link upgrade documentation (oamg#836) - [IPU 8 -> 9]: Add postgresqlcheck actor to link upgrade documentation (oamg#802) - [IPU 8 -> 9]: Add scan & checks for VDO devices (oamg#821) - [IPU 8 -> 9]: Apply a new way of disabling SELinux (oamg#769) - [IPU 8 -> 9]: Check SSSD configuration for changes in RHEL9 and report them (oamg#732) - [IPU 8 -> 9]: Check the existence of the custom network-scripts (oamg#729) - [IPU 8 -> 9]: Provide upgrade inhibitor for ipa-server (oamg#765) ## Additional changes interesting for devels - Move target release and flavor specification to a separate lib (oamg#753) - Refactor "transactionworkarounds" actor and fix tests (oamg#759) - Several actors moved to the system_upgrade/common repository (oamg#800, oamg#803, oamg#805, oamg#833) Signed-off-by: Michal Reznik <mreznik@redhat.com>
## Packaging - Requires leapp-framework >= 2.2 - Bump leapp-framework-dependencies to 5 ## Upgrade handling ### Fixes - Fallback to /etc/leapp/repos.d if missing config option instead of using cwd (#849) - Filter out unrelated PES data for the particular IPU path (#789) - Fix bug with existing symlink when migrating YUM configuration files (#811) - Fix creating invalid answerfile in "authselectcheck" actor (#748) - Fix generating of instructions/data for the leapp DNF plugin during the IPU (#754) - Fix generating the target initramfs when additional files and dracut modules are requested to be added (#838) - Fix getting device attribute through udev on Python 3 (#758) - Fix parsing of sysctl output (#793) - Fix processing of merge events from PES data (#768, #825) - Fix random crashes when printing DNF output (#745) - Fix scanning "/etc/default/grub" with empty line (#845) - Fix scanning information about mounted devices (#711) - Fix severities in the "targetuserspacecreator" actor (#751) - Fix the "rerun" command after adding the "--channel" option (#750) - Fix the execution order for the dnf dry run actor (#801) - Skip checking the flavor and target_version upon leapp --resume (#781) - Use more accurate tense in the SELinux messaging (#614) ### Enhancements - Introduce IPU for RHEL 8 to RHEL 9 \o/ - New upgrade paths for RHEL with SAP HANA (#834) - Changed upgrade paths: -- RHEL 7.9 -> [8.4, 8.6] (default: 8.6) -- RHEL 8.6 -> 9.0 -- RHEL with SAP 7.9 -> [8.2, 8.6] (default: 8.2) -- RHEL with SAP 8.6 -> 9.0 - Add 8.6, 9.0 Beta & GA product certificates (#776, #794) - Add detection of enabled YUM & DNF plugins (#703) - Bind the /run/lock dir into the container in the upgrade initramfs env (#831) - Enable RHEL 8 to RHEL 9 upgrades on RHUI for AWS (#828) - Enhance handling selinux related stuff for 8 to 9 upgrade (#749) - Generalize checking of device drivers (#835) - Improve the performance of the leapp execution for "pre first reboot" phases (#741) - Introduce DNFWorkarounds to register scripts to be executed before DNF run (#841) - Introduce DNF modularity support (#672, #799) - Introduce the --report-schema option to control the version of the generated report format (#696) - Introduce the --target option to specify the version of the target system (#780) - Provide the LEAPP_IPU_IN_PROGRESS envar during the IPU (#830) - [IPU 7 -> 8]: Add CUPS actors - cupsscanner, cupscheck, cupsmigrate (#181) - [IPU 7 -> 8]: Convert restrictions with IPv6 mask in "migratentp" actor (#756) - [IPU 7 -> 8]: Handle upgrading Satellite instances (#733) - [IPU 7 -> 8]: Warn about docker deprecation when installed - [IPU 7 -> 8]: Zipl: Inhibit if boot entries share the same kernel image (#816) - [IPU 7 -> 8]: bind configuration check (#521) - [IPU 8 -> 9]: Add actor that ensures ifcfg files work in el9 (#839) - [IPU 8 -> 9]: Add actor that scans for deprecated network settings (#842) - [IPU 8 -> 9]: Add inhibitor FirewalldCheckServiceTftpClient (#792) - [IPU 8 -> 9]: Add inihibtor FirewalldCheckAllowZoneDrifting (#777) - [IPU 8 -> 9]: Add kpatch actor to handle live kernel patching during IPU (#837) - [IPU 8 -> 9]: Add mariadbcheck actor to link upgrade documentation (#836) - [IPU 8 -> 9]: Add postgresqlcheck actor to link upgrade documentation (#802) - [IPU 8 -> 9]: Add scan & checks for VDO devices (#821) - [IPU 8 -> 9]: Apply a new way of disabling SELinux (#769) - [IPU 8 -> 9]: Check SSSD configuration for changes in RHEL9 and report them (#732) - [IPU 8 -> 9]: Check the existence of the custom network-scripts (#729) - [IPU 8 -> 9]: Provide upgrade inhibitor for ipa-server (#765) ## Additional changes interesting for devels - Move target release and flavor specification to a separate lib (#753) - Refactor "transactionworkarounds" actor and fix tests (#759) - Several actors moved to the system_upgrade/common repository (#800, #803, #805, #833) Signed-off-by: Michal Reznik <mreznik@redhat.com>
## Packaging - Requires leapp-framework >= 2.2 - Bump leapp-framework-dependencies to 5 ## Upgrade handling ### Fixes - Fallback to /etc/leapp/repos.d if missing config option instead of using cwd (oamg#849) - Filter out unrelated PES data for the particular IPU path (oamg#789) - Fix bug with existing symlink when migrating YUM configuration files (oamg#811) - Fix creating invalid answerfile in "authselectcheck" actor (oamg#748) - Fix generating of instructions/data for the leapp DNF plugin during the IPU (oamg#754) - Fix generating the target initramfs when additional files and dracut modules are requested to be added (oamg#838) - Fix getting device attribute through udev on Python 3 (oamg#758) - Fix parsing of sysctl output (oamg#793) - Fix processing of merge events from PES data (oamg#768, oamg#825) - Fix random crashes when printing DNF output (oamg#745) - Fix scanning "/etc/default/grub" with empty line (oamg#845) - Fix scanning information about mounted devices (oamg#711) - Fix severities in the "targetuserspacecreator" actor (oamg#751) - Fix the "rerun" command after adding the "--channel" option (oamg#750) - Fix the execution order for the dnf dry run actor (oamg#801) - Skip checking the flavor and target_version upon leapp --resume (oamg#781) - Use more accurate tense in the SELinux messaging (oamg#614) ### Enhancements - Introduce IPU for RHEL 8 to RHEL 9 \o/ - New upgrade paths for RHEL with SAP HANA (oamg#834) - Changed upgrade paths: -- RHEL 7.9 -> [8.4, 8.6] (default: 8.6) -- RHEL 8.6 -> 9.0 -- RHEL with SAP 7.9 -> [8.2, 8.6] (default: 8.2) -- RHEL with SAP 8.6 -> 9.0 - Add 8.6, 9.0 Beta & GA product certificates (oamg#776, oamg#794) - Add detection of enabled YUM & DNF plugins (oamg#703) - Bind the /run/lock dir into the container in the upgrade initramfs env (oamg#831) - Enable RHEL 8 to RHEL 9 upgrades on RHUI for AWS (oamg#828) - Enhance handling selinux related stuff for 8 to 9 upgrade (oamg#749) - Generalize checking of device drivers (oamg#835) - Improve the performance of the leapp execution for "pre first reboot" phases (oamg#741) - Introduce DNFWorkarounds to register scripts to be executed before DNF run (oamg#841) - Introduce DNF modularity support (oamg#672, oamg#799) - Introduce the --report-schema option to control the version of the generated report format (oamg#696) - Introduce the --target option to specify the version of the target system (oamg#780) - Provide the LEAPP_IPU_IN_PROGRESS envar during the IPU (oamg#830) - [IPU 7 -> 8]: Add CUPS actors - cupsscanner, cupscheck, cupsmigrate (oamg#181) - [IPU 7 -> 8]: Convert restrictions with IPv6 mask in "migratentp" actor (oamg#756) - [IPU 7 -> 8]: Handle upgrading Satellite instances (oamg#733) - [IPU 7 -> 8]: Warn about docker deprecation when installed - [IPU 7 -> 8]: Zipl: Inhibit if boot entries share the same kernel image (oamg#816) - [IPU 7 -> 8]: bind configuration check (oamg#521) - [IPU 8 -> 9]: Add actor that ensures ifcfg files work in el9 (oamg#839) - [IPU 8 -> 9]: Add actor that scans for deprecated network settings (oamg#842) - [IPU 8 -> 9]: Add inhibitor FirewalldCheckServiceTftpClient (oamg#792) - [IPU 8 -> 9]: Add inihibtor FirewalldCheckAllowZoneDrifting (oamg#777) - [IPU 8 -> 9]: Add kpatch actor to handle live kernel patching during IPU (oamg#837) - [IPU 8 -> 9]: Add mariadbcheck actor to link upgrade documentation (oamg#836) - [IPU 8 -> 9]: Add postgresqlcheck actor to link upgrade documentation (oamg#802) - [IPU 8 -> 9]: Add scan & checks for VDO devices (oamg#821) - [IPU 8 -> 9]: Apply a new way of disabling SELinux (oamg#769) - [IPU 8 -> 9]: Check SSSD configuration for changes in RHEL9 and report them (oamg#732) - [IPU 8 -> 9]: Check the existence of the custom network-scripts (oamg#729) - [IPU 8 -> 9]: Provide upgrade inhibitor for ipa-server (oamg#765) ## Additional changes interesting for devels - Move target release and flavor specification to a separate lib (oamg#753) - Refactor "transactionworkarounds" actor and fix tests (oamg#759) - Several actors moved to the system_upgrade/common repository (oamg#800, oamg#803, oamg#805, oamg#833) Signed-off-by: Michal Reznik <mreznik@redhat.com>
## Packaging - Drop the dependency on leapp-repository for Fedora and RHEL 8+ (oamg#717) - Provide builds for RHEL 7+ and Fedora (oamg#717) - Drop automatically generated Python dependences on RHEL 8+ and Fedora systems (oamg#717, oamg#716) - Bump the provided leapp-framework capability to 2.0 (oamg#700) ## Framework ### Fixes - models: Do not make references to private symbols (oamg#718) ### Enhancements - Introduce the LEAPP_DEVEL_DATABASE_SYNC_OFF envar to enable speed up writes into the leapp database by disabling synchronisation - only for development / testing purposes (oamg#732) ## Leapp ### Fixes - Fix print of the leapp help msg for Python 3.6+ (oamg#731) ### Enhancements - The leapp commands are now defined/provided by leapp-repositories; leapp discovers the specified commands automatically (oamg#700) - Add CLI support for `choices` and `default` for options of leapp commands (oamg#734) ## Modifications - Makefile: Added the `fast_lint` target to apply linters just on files different from master (oamg#733)
this is mostly for me and @vinzenz to have something to talk about :)