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

support upgrade el7to8 on AlibabaCloud rhui #1088

Merged
merged 2 commits into from
Jul 31, 2023
Merged

support upgrade el7to8 on AlibabaCloud rhui #1088

merged 2 commits into from
Jul 31, 2023

Conversation

jinkkkang
Copy link
Contributor

@jinkkkang jinkkkang commented Jun 12, 2023

support rhel 7 upgrade to rhel 8 on alibaba cloud

@github-actions
Copy link

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 mergeable.
If you want to request a review or rebuild a package in copr, you can use following commands as a comment:

  • review please @oamg/developers to notify leapp developers of the review request
  • /packit copr-build to submit a public copr build using packit

Packit will automatically schedule regression tests for this PR's build and latest upstream leapp build. If you need a different version of leapp from PR#42, use /packit test oamg/leapp#42

To launch regression testing public members of oamg organization can leave the following comment:

  • /rerun to schedule basic regression tests using this pr build and latest upstream leapp build as artifacts
  • /rerun 42 to schedule basic regression tests using this pr build and leapp*PR42* as artifacts
  • /rerun-sst to schedule sst tests using this pr build and latest upstream leapp build as artifacts
  • /rerun-sst 42 to schedule sst tests using this pr build and leapp*PR42* as artifacts

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 contact leapp-infra.

Copy link
Member

@Rezney Rezney left a comment

Choose a reason for hiding this comment

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

Thank you very much for your contribution. It is nice to see you already got used to our including Leapp metadata in our repository. Good job! Would you be able to share also the "leapp-rhui-alibaba' package?

repos/system_upgrade/common/libraries/rhui.py Outdated Show resolved Hide resolved
@@ -56,7 +56,7 @@ def has_katello_prefix(pkg):

upg_path = rhui.get_upg_path()
# AWS RHUI packages do not have to be whitelisted because they are signed by RedHat
whitelisted_cloud_flavours = ('azure', 'azure-eus', 'azure-sap-ha', 'azure-sap-apps', 'google', 'google-sap')
whitelisted_cloud_flavours = ('azure', 'azure-eus', 'azure-sap-ha', 'azure-sap-apps', 'google', 'google-sap','alibaba')
Copy link
Member

Choose a reason for hiding this comment

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

missing whitespace after comma

@@ -105,6 +105,13 @@
"target": [
"rhel8-rhui-google-compute-engine-leapp"
]
},
{
"source": "rhui-custom-rhui_client_at_alibaba",
Copy link
Member

Choose a reason for hiding this comment

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

Not sure change to repomap.json file belongs here :(
Yes, we started shipping leapp data files with the package, but repomapping is automatically generated and changing it here will last only till the next version is shipped.
I believe we have to change the data files that are used to generate the repomap.json, not the file itself. The problem is - they are not in this repo, so I believe this should be done by us -> the repomap.json should be regenerated -> the change will be shipped in a different commit.
@pirat89 @mm0ran @mmacura311 @Rezney what's your opinion on this?

Copy link
Member

@pirat89 pirat89 Jun 27, 2023

Choose a reason for hiding this comment

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

@fernflower it's not supposed to be merged yet - it's waiting for @Rezney when he returns from the vacation. yes, once it's decided this is going to be merged, the new data must be generated - for that, we will need to get "source of truth" for alibaba repositories.

@jinkkkang can you please provide repofiles from alibaba machine which we could use for our internal script? as the repomap data is generated, without updating our internals repositories would get removed if we do not update the script. regarding additional internal we use in the script, we cannot make it public, only the data. we will need related repofiles for each source & target rhel X system

Copy link
Member

Choose a reason for hiding this comment

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

@fernflower repomap file has been updated and some other changes in the code applied. see my 2nd commit.

@fernflower
Copy link
Member

Please fix linter errors like

 --- Running pylint ---
************* Module actor
[C0301 line-too-long] Line too long (127/119) File: repos/system_upgrade/common/actors/redhatsignedrpmscanner/actor.py, line 59, in 

@pirat89
Copy link
Member

pirat89 commented Jul 20, 2023

Related update to update the json schema:

@pirat89
Copy link
Member

pirat89 commented Jul 24, 2023

@jinkkkang Hi \o can you please check the changes in the repomap.json file I did in the last commit? If it's correct, rebase please agaist up-to-date upstream master branch (or I can do it if you are ok that I change your commits). Also I want to ensure that rhui-custom-rhui_client_at_alibaba is the expected repoid on RHEL 7. To me it seems to be wrong, but that's what I found regarding the repo files you shared with me.

@jinkkkang
Copy link
Contributor Author

@jinkkkang Hi \o can you please check the changes in the repomap.json file I did in the last commit? If it's correct, rebase please agaist up-to-date upstream master branch (or I can do it if you are ok that I change your commits). Also I want to ensure that rhui-custom-rhui_client_at_alibaba is the expected repoid on RHEL 7. To me it seems to be wrong, but that's what I found regarding the repo files you shared with me.

@pirat89 we have verified that the update to repomap file are OK, it's ok to change repomap.json in my commit, just do it, and the rhui-custom-rhui_client_at_alibaba name is ok, the name on the rhel7 system is indeed this, we name rhui-custom-rhui_client_at_alibaba-rhel-8 in rhel 8 repo.

jinkangkang.jkk and others added 2 commits July 25, 2023 16:30
Cover RHUI repositories on Alibaba cloud for IPU 7 -> 8.

Signed-off-by: Petr Stodulka <[email protected]>
@pirat89
Copy link
Member

pirat89 commented Jul 25, 2023

/packit test

@pirat89 pirat89 added this to the 8.9/9.3 milestone Jul 31, 2023
Copy link
Member

@pirat89 pirat89 left a comment

Choose a reason for hiding this comment

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

merging. thanks @jinkkkang !!

@pirat89 pirat89 merged commit 1b471b2 into oamg:master Jul 31, 2023
@pirat89 pirat89 added the changelog-checked The merger/reviewer checked the changelog draft document and updated it when relevant label Aug 23, 2023
pirat89 added a commit to pirat89/leapp-repository that referenced this pull request Aug 23, 2023
## Packaging
- Requires leapp-framework 5.0

## Upgrade handling
### Fixes
- Add el8toel9 actor to handle directory -> symlink with ruby IRB. (oamg#1076)
- Do not try to update GRUB core on IBM Z systems (oamg#1117)
- Fix failing upgrades with devtmpfs file systems specified in FSTAB (oamg#1090)
- Fix the calculation of the required free space on each partitions/volume for the upgrade transactions (oamg#1097)
- Fix the generation of the report about hybrid images (oamg#1064)
- Handle correctly the installed certificates to allow upgrades with custom repositories using HTTPs with enabled SSL verification (oamg#1106)
- Minor improvements and fixes of various reports (oamg#1066, oamg#1067, oamg#1085)
- Update error messages about leapp data files to inform user how to obtain valid data files (oamg#1121)
- Update links in various reports (oamg#1062, oamg#1086)
- Update the repomap data to cover changed repoids in RHUI Azure (oamg#1087)
- [IPU 7 -> 8] Fix false positive report about invalid symlinks on RHEL 7 (oamg#1052)
- [IPU 8 -> 9] Inhibit the upgrade when unsupported x86-64 microarchitecture is detected (oamg#1059)

### Enhancements
- Include updated leapp data files in the RPM (oamg#1046, oamg#1092, oamg#1119)
- Update the set of supported upgrade paths (oamg#1077):
  - RHEL with SAP HANA 7.9 -> 8.6, 8.8 (default: 8.6)
  - RHEL with SAP HANA 8.8 -> 9.2
- Introduce new upgrade paths:
  - RHEL 7.9 -> 8.9 (default)
  - RHEL 8.9 -> 9.3
- Correctly update grub2 when /boot resides on multiple devices aggregated in RAID (oamg#1093, oamg#1115)
- Enable upgrades for machines using RHUI on AlibabaCloud (oamg#1088)
- Introduce possibility to add kernel drivers to initramfs (oamg#1081)
- Redesign handling of information about kernel (booted and target) in preparation for new changes in RHEL 9 (oamg#1107)
- Redesign source system overlay to use disk images backed by sparse files to optimize disk space consumption (oamg#1097, oamg#1103)
- Requires leapp-framework 5.0 (oamg#1061, oamg#1116)
- Use new leapp CLI API which provides better report summary output (oamg#1061, oamg#1116)
- [IPU 8 -> 9] Detect and report use of deprecated Xorg drivers (oamg#1078)
- [IPU 8 -> 9] Introduce IPU for systems with FIPS enabled (oamg#1053)

## Additional changes interesting for devels
- Deprecated `GrubInfo.orig_device_name` field in the `GrubInfo` model (replaced by `GrubInfo.orig_devices`) (oamg#1093)
- Deprecated `InstalledTargetKernelVersion` model (replaced by `InstalledTargetKernelInfo`) (oamg#1107)
- Deprecated `leapp.libraries.common.config.version.is_rhel_realtime` (check the type in msg `KernelInfo`, field `type`) (oamg#1107)
- Deprecated `leapp.libraries.common.grub.get_grub_device()` (replaced by `leapp.libraries.common.grub.get_grub_devices()`) (oamg#1093)
- Introduced new devel envar LEAPP_DEVEL_KEEP_DISK_IMGS=1 to skip the removal of the created disk images for OVL. That's sometimes handy for the debugging. (oamg#1097)
@pirat89 pirat89 mentioned this pull request Aug 23, 2023
Rezney pushed a commit that referenced this pull request Aug 23, 2023
## Packaging
- Requires leapp-framework 5.0

## Upgrade handling
### Fixes
- Add el8toel9 actor to handle directory -> symlink with ruby IRB. (#1076)
- Do not try to update GRUB core on IBM Z systems (#1117)
- Fix failing upgrades with devtmpfs file systems specified in FSTAB (#1090)
- Fix the calculation of the required free space on each partitions/volume for the upgrade transactions (#1097)
- Fix the generation of the report about hybrid images (#1064)
- Handle correctly the installed certificates to allow upgrades with custom repositories using HTTPs with enabled SSL verification (#1106)
- Minor improvements and fixes of various reports (#1066, #1067, #1085)
- Update error messages about leapp data files to inform user how to obtain valid data files (#1121)
- Update links in various reports (#1062, #1086)
- Update the repomap data to cover changed repoids in RHUI Azure (#1087)
- [IPU 7 -> 8] Fix false positive report about invalid symlinks on RHEL 7 (#1052)
- [IPU 8 -> 9] Inhibit the upgrade when unsupported x86-64 microarchitecture is detected (#1059)

### Enhancements
- Include updated leapp data files in the RPM (#1046, #1092, #1119)
- Update the set of supported upgrade paths (#1077):
  - RHEL with SAP HANA 7.9 -> 8.6, 8.8 (default: 8.6)
  - RHEL with SAP HANA 8.8 -> 9.2
- Introduce new upgrade paths:
  - RHEL 7.9 -> 8.9 (default)
  - RHEL 8.9 -> 9.3
- Correctly update grub2 when /boot resides on multiple devices aggregated in RAID (#1093, #1115)
- Enable upgrades for machines using RHUI on AlibabaCloud (#1088)
- Introduce possibility to add kernel drivers to initramfs (#1081)
- Redesign handling of information about kernel (booted and target) in preparation for new changes in RHEL 9 (#1107)
- Redesign source system overlay to use disk images backed by sparse files to optimize disk space consumption (#1097, #1103)
- Requires leapp-framework 5.0 (#1061, #1116)
- Use new leapp CLI API which provides better report summary output (#1061, #1116)
- [IPU 8 -> 9] Detect and report use of deprecated Xorg drivers (#1078)
- [IPU 8 -> 9] Introduce IPU for systems with FIPS enabled (#1053)

## Additional changes interesting for devels
- Deprecated `GrubInfo.orig_device_name` field in the `GrubInfo` model (replaced by `GrubInfo.orig_devices`) (#1093)
- Deprecated `InstalledTargetKernelVersion` model (replaced by `InstalledTargetKernelInfo`) (#1107)
- Deprecated `leapp.libraries.common.config.version.is_rhel_realtime` (check the type in msg `KernelInfo`, field `type`) (#1107)
- Deprecated `leapp.libraries.common.grub.get_grub_device()` (replaced by `leapp.libraries.common.grub.get_grub_devices()`) (#1093)
- Introduced new devel envar LEAPP_DEVEL_KEEP_DISK_IMGS=1 to skip the removal of the created disk images for OVL. That's sometimes handy for the debugging. (#1097)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-checked The merger/reviewer checked the changelog draft document and updated it when relevant
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants