forked from rpms/leapp-repository
45 lines
2.1 KiB
Diff
45 lines
2.1 KiB
Diff
From 82fd5e9844ef0d7910959c601a9e5c25252e53cf Mon Sep 17 00:00:00 2001
|
|
From: Matej Matuska <mmatuska@redhat.com>
|
|
Date: Thu, 21 Aug 2025 19:48:45 +0200
|
|
Subject: [PATCH 097/111] lib/version: Remove RHEL 7 from supported version
|
|
|
|
---
|
|
.../common/actors/checkosrelease/tests/test_checkosrelease.py | 4 ++--
|
|
repos/system_upgrade/common/libraries/config/version.py | 4 ----
|
|
2 files changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/checkosrelease/tests/test_checkosrelease.py b/repos/system_upgrade/common/actors/checkosrelease/tests/test_checkosrelease.py
|
|
index aa0fd636..1ca8a1d7 100644
|
|
--- a/repos/system_upgrade/common/actors/checkosrelease/tests/test_checkosrelease.py
|
|
+++ b/repos/system_upgrade/common/actors/checkosrelease/tests/test_checkosrelease.py
|
|
@@ -27,8 +27,8 @@ def test_no_skip_check(monkeypatch):
|
|
|
|
def test_not_supported_release(monkeypatch):
|
|
monkeypatch.setattr(version, "is_supported_version", lambda: False)
|
|
- monkeypatch.setattr(version, "get_source_major_version", lambda: '7')
|
|
- monkeypatch.setattr(version, "current_version", lambda: ('bad', '7'))
|
|
+ monkeypatch.setattr(version, "get_source_major_version", lambda: '8')
|
|
+ monkeypatch.setattr(version, "current_version", lambda: ('bad', '8'))
|
|
monkeypatch.setattr(reporting, "create_report", create_report_mocked())
|
|
|
|
checkosrelease.check_os_version()
|
|
diff --git a/repos/system_upgrade/common/libraries/config/version.py b/repos/system_upgrade/common/libraries/config/version.py
|
|
index 84cbd753..c9bc3fb2 100644
|
|
--- a/repos/system_upgrade/common/libraries/config/version.py
|
|
+++ b/repos/system_upgrade/common/libraries/config/version.py
|
|
@@ -14,11 +14,7 @@ OP_MAP = {
|
|
'<=': operator.le
|
|
}
|
|
|
|
-# TODO(pstodulk): drop 9.4 & 9.5 before May 2025 release
|
|
-# These will not be supported fo IPU 9 -> 10
|
|
_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.10'], 'rhel-saphana': ['8.10']},
|
|
'9': {'rhel': ['9.6'], 'rhel-saphana': ['9.6']},
|
|
}
|
|
--
|
|
2.52.0
|
|
|