75c9028095
- Enable new upgrade path for RHEL 8.10 -> RHEL 9.4 (including RHEL with SAP HANA) - Introduce generic transition of systemd services states during the IPU - Introduce possibility to upgrade with local repositories - Improve possibilities of upgrade when a proxy is configured in DNF configutation file - Fix handling of symlinks under /etc/pki when managing certificates - Fix the upgrade with custom https repositories - Default to the NO_RHSM mode when subscription-manager is not installed - Detect customized configuration of dynamic linker - Drop the invalid `tuv` target channel for the --channel option - Fix the issue of going out of bounds in the isccfg parser - Fix traceback when saving the rhsm facts results and the /etc/rhsm/facts directory doesn’t exist yet - Load all rpm repository substitutions that dnf knows about, not just "releasever" only - Simplify handling of upgrades on systems using RHUI, reducing the maintenance burden for cloud providers - Detect possible unexpected RPM GPG keys has been installed during RPM transaction - Resolves: RHEL-16729
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From 5a3bded4be67e6a99ba739e15c3b9d533134f35b Mon Sep 17 00:00:00 2001
|
|
From: Petr Stodulka <pstodulk@redhat.com>
|
|
Date: Thu, 16 Nov 2023 08:46:55 +0100
|
|
Subject: [PATCH 35/38] Update upgrade paths: Add 8.10/9.4
|
|
|
|
Adding upgrade paths (RHEL and RHEL with SAP HANA):
|
|
7.9 -> 8.10
|
|
8.10 -> 9.4
|
|
|
|
Following upgrade paths will be dropped later in this release.
|
|
Consider them as deprecated now.
|
|
7.9 -> 8.6 (RHEL and RHEL with SAP HANA)
|
|
7.9 -> 8.9
|
|
8.6 -> 9.0 (RHEL and RHEL with SAP HANA)
|
|
8.9 -> 8.3
|
|
---
|
|
.../system_upgrade/common/files/upgrade_paths.json | 14 ++++++++------
|
|
.../common/libraries/config/version.py | 2 +-
|
|
2 files changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/files/upgrade_paths.json b/repos/system_upgrade/common/files/upgrade_paths.json
|
|
index 2069e26d..25c6db7c 100644
|
|
--- a/repos/system_upgrade/common/files/upgrade_paths.json
|
|
+++ b/repos/system_upgrade/common/files/upgrade_paths.json
|
|
@@ -1,17 +1,19 @@
|
|
{
|
|
"default": {
|
|
- "7.9": ["8.6", "8.8", "8.9"],
|
|
+ "7.9": ["8.6", "8.8", "8.9", "8.10"],
|
|
"8.6": ["9.0"],
|
|
"8.8": ["9.2"],
|
|
"8.9": ["9.3"],
|
|
- "7": ["8.6", "8.8", "8.9"],
|
|
- "8": ["9.3"]
|
|
+ "8.10": ["9.4"],
|
|
+ "7": ["8.6", "8.8", "8.9", "8.10"],
|
|
+ "8": ["9.0", "9.2", "9.3", "9.4"]
|
|
},
|
|
"saphana": {
|
|
- "7.9": ["8.8", "8.6"],
|
|
- "7": ["8.8", "8.6"],
|
|
+ "7.9": ["8.6", "8.10", "8.8"],
|
|
+ "7": ["8.6", "8.10", "8.8"],
|
|
"8.6": ["9.0"],
|
|
"8.8": ["9.2"],
|
|
- "8": ["9.2", "9.0"]
|
|
+ "8.10": ["9.4"],
|
|
+ "8": ["9.0", "9.4", "9.2"]
|
|
}
|
|
}
|
|
diff --git a/repos/system_upgrade/common/libraries/config/version.py b/repos/system_upgrade/common/libraries/config/version.py
|
|
index 0f1e5874..12598960 100644
|
|
--- a/repos/system_upgrade/common/libraries/config/version.py
|
|
+++ b/repos/system_upgrade/common/libraries/config/version.py
|
|
@@ -16,7 +16,7 @@ OP_MAP = {
|
|
_SUPPORTED_VERSIONS = {
|
|
# Note: 'rhel-alt' is detected when on 'rhel' with kernel 4.x
|
|
'7': {'rhel': ['7.9'], 'rhel-alt': [], 'rhel-saphana': ['7.9']},
|
|
- '8': {'rhel': ['8.6', '8.8', '8.9'], 'rhel-saphana': ['8.6', '8.8']},
|
|
+ '8': {'rhel': ['8.6', '8.8', '8.9', '8.10'], 'rhel-saphana': ['8.6', '8.8', '8.10']},
|
|
}
|
|
|
|
|
|
--
|
|
2.41.0
|
|
|