From 1fb8885f8393ff35fc926f14ff675c9b0f59adb4 Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk@redhat.com>
Date: Thu, 16 Nov 2023 08:46:55 +0100
Subject: [PATCH] Update upgrade paths: Add 8.10/9.4, drop 8.6/9.0

Adding upgrade paths (RHEL and RHEL with SAP HANA):
  7.9 -> 8.10
  8.10 -> 9.4

Dropping upgrade paths:
  7.9 -> 8.6
  8.6 -> 9.0 (RHEL and RHEL with SAP HANA)

Still keeping possibility to upgrade from/to 8.9 & 9.3 temporarily
for the testing purposes. But these are expected to be dropped
completely for this release. These must be dropped in the start of
Feb at latest.
---
 .../common/files/upgrade_paths.json              | 16 ++++++++--------
 .../common/libraries/config/version.py           |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/repos/system_upgrade/common/files/upgrade_paths.json b/repos/system_upgrade/common/files/upgrade_paths.json
index 2069e26d89..be35646ddb 100644
--- a/repos/system_upgrade/common/files/upgrade_paths.json
+++ b/repos/system_upgrade/common/files/upgrade_paths.json
@@ -1,17 +1,17 @@
 {
     "default": {
-        "7.9": ["8.6", "8.8", "8.9"],
-        "8.6": ["9.0"],
+        "7.9": ["8.8", "8.9", "8.10"],
         "8.8": ["9.2"],
         "8.9": ["9.3"],
-        "7": ["8.6", "8.8", "8.9"],
-        "8": ["9.3"]
+        "8.10": ["9.4"],
+        "7": ["8.8", "8.9", "8.10"],
+        "8": ["9.2", "9.3", "9.4"]
     },
     "saphana": {
-        "7.9": ["8.8", "8.6"],
-        "7": ["8.8", "8.6"],
-        "8.6": ["9.0"],
+        "7.9": ["8.10", "8.8"],
+        "7": ["8.10", "8.8"],
         "8.8": ["9.2"],
-        "8": ["9.2", "9.0"]
+        "8.10": ["9.4"],
+        "8": ["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 0f1e5874a2..bcf9960c45 100644
--- a/repos/system_upgrade/common/libraries/config/version.py
+++ b/repos/system_upgrade/common/libraries/config/version.py
@@ -16,7 +16,7 @@
 _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.8', '8.9', '8.10'], 'rhel-saphana': ['8.8', '8.10']},
 }