From 63c33d4dee5c560a7037d67082630d7eea1df748 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 9 Feb 2024 08:34:44 +0100 Subject: [PATCH] Drop obsoleted upgrade path (obsoleted releases: 8.6, 8.9, 9.0, 9.3) This is followup on announced changed from commit 5a3bded. The support for noted RHEL releases ends on May 2024, hence the upgrade paths related to these releases are dropped. Jira: OAMG-10452 --- .../common/files/upgrade_paths.json | 15 ++++++--------- .../common/libraries/config/version.py | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/repos/system_upgrade/common/files/upgrade_paths.json b/repos/system_upgrade/common/files/upgrade_paths.json index 25c6db7cc2..880595c006 100644 --- a/repos/system_upgrade/common/files/upgrade_paths.json +++ b/repos/system_upgrade/common/files/upgrade_paths.json @@ -1,19 +1,16 @@ { "default": { - "7.9": ["8.6", "8.8", "8.9", "8.10"], - "8.6": ["9.0"], + "7.9": ["8.8", "8.10"], "8.8": ["9.2"], - "8.9": ["9.3"], "8.10": ["9.4"], - "7": ["8.6", "8.8", "8.9", "8.10"], - "8": ["9.0", "9.2", "9.3", "9.4"] + "7": ["8.8", "8.10"], + "8": ["9.2", "9.4"] }, "saphana": { - "7.9": ["8.6", "8.10", "8.8"], - "7": ["8.6", "8.10", "8.8"], - "8.6": ["9.0"], + "7.9": ["8.10", "8.8"], + "7": ["8.10", "8.8"], "8.8": ["9.2"], "8.10": ["9.4"], - "8": ["9.0", "9.4", "9.2"] + "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 1259896098..fdfeface50 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', '8.10'], 'rhel-saphana': ['8.6', '8.8', '8.10']}, + '8': {'rhel': ['8.8', '8.10'], 'rhel-saphana': ['8.8', '8.10']}, }