d9029cec24
- Improve set_systemd_services_states logging - [IPU 7 -> 8] Fix detection of bootable device on RAID - Fix detection of valid sshd config with internal-sftp subsystem in Leapp - Handle a false positive GPG check error when TargetUserSpaceInfo is missing - Fix failing "update-ca-trust" command caused by missing util-linux package - Improve report when a system is unsupported - Fix handling of versions in RHUI configuration for ELS and SAP upgrades - Add missing RHUI GCP config info for RHEL for SAP - Resolves: RHEL-33902, RHEL-30573, RHEL-43978, RHEL-39046, RHEL-39047, RHEL-39049
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
From 94224a42be57a6da1bd372580b5378b71f45a7f3 Mon Sep 17 00:00:00 2001
|
|
From: mhecko <mhecko@redhat.com>
|
|
Date: Tue, 28 May 2024 10:38:02 +0200
|
|
Subject: [PATCH 54/92] rhui(google): add RHEL7 ELS setup into RHUI_SETUPS
|
|
|
|
Add RHEL7 ELS setup into RHUI_SETUPS and modify repomapping
|
|
accordingly.
|
|
---
|
|
etc/leapp/files/repomap.json | 18 +++++++++++++++++-
|
|
repos/system_upgrade/common/libraries/rhui.py | 1 +
|
|
2 files changed, 18 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/etc/leapp/files/repomap.json b/etc/leapp/files/repomap.json
|
|
index 1ee6c56a..8a490b84 100644
|
|
--- a/etc/leapp/files/repomap.json
|
|
+++ b/etc/leapp/files/repomap.json
|
|
@@ -1,5 +1,5 @@
|
|
{
|
|
- "datetime": "202404091246Z",
|
|
+ "datetime": "202405281033Z",
|
|
"version_format": "1.2.1",
|
|
"mapping": [
|
|
{
|
|
@@ -414,6 +414,14 @@
|
|
"repo_type": "rpm",
|
|
"rhui": "google"
|
|
},
|
|
+ {
|
|
+ "major_version": "7",
|
|
+ "repoid": "rhui-rhel-7-server-els-rhui-rpms",
|
|
+ "arch": "x86_64",
|
|
+ "channel": "els",
|
|
+ "repo_type": "rpm",
|
|
+ "rhui": "google"
|
|
+ },
|
|
{
|
|
"major_version": "7",
|
|
"repoid": "rhui-rhel-7-server-rhui-eus-rpms",
|
|
@@ -618,6 +626,14 @@
|
|
"repo_type": "rpm",
|
|
"rhui": "google"
|
|
},
|
|
+ {
|
|
+ "major_version": "7",
|
|
+ "repoid": "rhui-rhel-7-server-els-optional-rhui-rpms",
|
|
+ "arch": "x86_64",
|
|
+ "channel": "els",
|
|
+ "repo_type": "rpm",
|
|
+ "rhui": "google"
|
|
+ },
|
|
{
|
|
"major_version": "7",
|
|
"repoid": "rhui-rhel-7-server-rhui-optional-rpms",
|
|
diff --git a/repos/system_upgrade/common/libraries/rhui.py b/repos/system_upgrade/common/libraries/rhui.py
|
|
index a0669ec4..8ae81537 100644
|
|
--- a/repos/system_upgrade/common/libraries/rhui.py
|
|
+++ b/repos/system_upgrade/common/libraries/rhui.py
|
|
@@ -307,6 +307,7 @@ RHUI_SETUPS = {
|
|
],
|
|
RHUIFamily(RHUIProvider.GOOGLE, client_files_folder='google'): [
|
|
mk_rhui_setup(clients={'google-rhui-client-rhel7'}, os_version='7'),
|
|
+ mk_rhui_setup(clients={'google-rhui-client-rhel7-els'}, os_version='7'),
|
|
mk_rhui_setup(clients={'google-rhui-client-rhel8'}, leapp_pkg='leapp-rhui-google',
|
|
mandatory_files=[('leapp-google.repo', YUM_REPOS_PATH)],
|
|
files_supporting_client_operation=['leapp-google.repo'],
|
|
--
|
|
2.42.0
|
|
|