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.

Sign up for GitHub

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

Jump to bottom

rhui(gcp): add SAP RHEL 8.10 client #1253

Merged
merged 2 commits into from
Jun 10, 2024
Merged

rhui(gcp): add SAP RHEL 8.10 client #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ac3312
rhui(gcp): add SAP RHEL 8.10 client
Jun 10, 2024
ec39c6d
Add spaces to message strings
abadger Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,20 @@ def setup_target_rhui_access_if_needed(context, indata):
_apply_rhui_access_postinstall_tasks(context, setup_info)

# Do a cleanup so there are not duplicit repoids
files_owned_by_clients = _query_rpm_for_pkg_files(context, indata.rhui_info.target_client_pkg_names)
try:
files_owned_by_clients = _query_rpm_for_pkg_files(context, indata.rhui_info.target_client_pkg_names)
except CalledProcessError as err: # We failed to rpm -qf PKG, the PKG is most likely not installed
api.current_logger().critical('Failed to query files owned by target RHUI clients (clients=%s). This is caused'
' by failing to install the target clients during the client-swap step.'
' Full error: %s', indata.rhui_info.target_client_pkg_names, err)

target_major = get_target_major_version()
plural_suffix = 's' if len(indata.rhui_info.target_client_pkg_names) > 1 else ''
client_rpms = ', '.join(indata.rhui_info.target_client_pkg_names)
msg = ('Could not find the RHEL {target_major} RHUI client rpm{plural_suffix} ({client_rpms})'
' in the cloud provider\'s client repository.')
raise StopActorExecutionError(msg.format(target_major=target_major, plural_suffix=plural_suffix,
client_rpms=client_rpms))

for copy_task in setup_info.preinstall_tasks.files_to_copy_into_overlay:
dest = get_copy_location_from_copy_in_task(context.base_dir, copy_task)
Expand Down
4 changes: 4 additions & 0 deletions repos/system_upgrade/common/libraries/rhui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@ def mk_rhui_setup(clients=None, leapp_pkg='', mandatory_files=None, optional_fil
mandatory_files=[('leapp-google-sap.repo', YUM_REPOS_PATH)],
files_supporting_client_operation=['leapp-google-sap.repo'],
os_version='8', content_channel=ContentChannel.E4S),
mk_rhui_setup(clients={'google-rhui-client-rhel810-sap'}, leapp_pkg='leapp-rhui-google-sap',
mandatory_files=[('leapp-google-sap.repo', YUM_REPOS_PATH)],
files_supporting_client_operation=['leapp-google-sap.repo'],
os_version='8.10', content_channel=ContentChannel.GA),
mk_rhui_setup(clients={'google-rhui-client-rhel9-sap'}, leapp_pkg='leapp-rhui-google-sap',
mandatory_files=[('leapp-google-sap.repo', YUM_REPOS_PATH)],
files_supporting_client_operation=['leapp-google-sap.repo'],
Expand Down