From 24714605538d2e197b0d7a5012528129439b4764 Mon Sep 17 00:00:00 2001 From: Michal Hecko Date: Tue, 17 Jun 2025 11:18:33 +0200 Subject: [PATCH 62/66] actor(checkrhui): do not boostrap client on AWS 9>10 The current implementation of the checkrhui actor and its modification of rhui-associated target userspace preparation instructions contains too coarse conditions on what should happen on specific upgrade paths. In other words, changes originally intended only for 8>9 are applied also during 9>10. This patch fixes this issue -- when performing 9>10 on AWS, we do not bootstrap the RHUI client, as it has too many dependencies. Instead, the leapp-rhui-aws package contains all repositories, certs and keys that grant repository access. Jira-ref: RHEL-64910 --- .../actors/cloud/checkrhui/libraries/checkrhui.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/repos/system_upgrade/common/actors/cloud/checkrhui/libraries/checkrhui.py b/repos/system_upgrade/common/actors/cloud/checkrhui/libraries/checkrhui.py index 64e36e08..ea154173 100644 --- a/repos/system_upgrade/common/actors/cloud/checkrhui/libraries/checkrhui.py +++ b/repos/system_upgrade/common/actors/cloud/checkrhui/libraries/checkrhui.py @@ -254,10 +254,16 @@ def customize_rhui_setup_for_aws(rhui_family, setup_info): # The leapp-rhui-aws will provide all necessary files to access entire RHEL8 content setup_info.bootstrap_target_client = False return + if target_version == '9': + amazon_plugin_copy_task = CopyFile(src='/usr/lib/python3.9/site-packages/dnf-plugins/amazon-id.py', + dst='/usr/lib/python3.6/site-packages/dnf-plugins/') + setup_info.postinstall_tasks.files_to_copy.append(amazon_plugin_copy_task) + return - amazon_plugin_copy_task = CopyFile(src='/usr/lib/python3.9/site-packages/dnf-plugins/amazon-id.py', - dst='/usr/lib/python3.6/site-packages/dnf-plugins/') - setup_info.postinstall_tasks.files_to_copy.append(amazon_plugin_copy_task) + # For 9>10 and higher we give up trying to do client swapping since the client has too many dependencies + # from target system's repositories. Our leapp-rhui-aws package will carry all of the repos provided + # by the client. + setup_info.bootstrap_target_client = False def produce_rhui_info_to_setup_target(rhui_family, source_setup_desc, target_setup_desc): -- 2.50.1