forked from rpms/leapp-repository
176 lines
9.2 KiB
Diff
176 lines
9.2 KiB
Diff
From a83309de2b633ccb35a16b2c0ccca6d1f317c6ae Mon Sep 17 00:00:00 2001
|
|
From: Matej Matuska <mmatuska@redhat.com>
|
|
Date: Thu, 21 Aug 2025 19:59:07 +0200
|
|
Subject: [PATCH 103/111] repomap lib: Drop RHEL 7 default PESID
|
|
|
|
---
|
|
.../libraries/peseventsscanner_repomap.py | 1 -
|
|
.../tests/test_pes_event_scanner.py | 44 +++++++++++--------
|
|
.../libraries/setuptargetrepos_repomap.py | 1 -
|
|
.../tests/test_repomapping.py | 20 ++++-----
|
|
4 files changed, 35 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/peseventsscanner/libraries/peseventsscanner_repomap.py b/repos/system_upgrade/common/actors/peseventsscanner/libraries/peseventsscanner_repomap.py
|
|
index abd35e0b..b1e46903 100644
|
|
--- a/repos/system_upgrade/common/actors/peseventsscanner/libraries/peseventsscanner_repomap.py
|
|
+++ b/repos/system_upgrade/common/actors/peseventsscanner/libraries/peseventsscanner_repomap.py
|
|
@@ -3,7 +3,6 @@ from leapp.libraries.common.config.version import get_source_major_version, get_
|
|
from leapp.libraries.stdlib import api
|
|
|
|
DEFAULT_PESID = {
|
|
- '7': 'rhel7-base',
|
|
'8': 'rhel8-BaseOS',
|
|
'9': 'rhel9-BaseOS',
|
|
'10': 'rhel10-BaseOS'
|
|
diff --git a/repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py b/repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py
|
|
index f67f3840..c8c14528 100644
|
|
--- a/repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py
|
|
+++ b/repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py
|
|
@@ -214,22 +214,22 @@ def test_actor_performs(monkeypatch):
|
|
|
|
events = [
|
|
Event(1, Action.SPLIT,
|
|
- {Pkg('split-in', 'rhel7-base')},
|
|
- {Pkg('split-out0', 'rhel8-BaseOS'), Pkg('split-out1', 'rhel8-BaseOS')},
|
|
- (7, 9), (8, 0), []),
|
|
+ {Pkg('split-in', 'rhel8-BaseOS')},
|
|
+ {Pkg('split-out0', 'rhel9-Baseos'), Pkg('split-out1', 'rhel9-Baseos')},
|
|
+ (8, 10), (9, 0), []),
|
|
Event(2, Action.MERGED,
|
|
- {Pkg('split-out0', 'rhel8-BaseOS'), Pkg('split-out1', 'rhel8-BaseOS')},
|
|
- {Pkg('merged-out', 'rhel8-BaseOS')},
|
|
- (8, 0), (8, 1), []),
|
|
+ {Pkg('split-out0', 'rhel9-Baseos'), Pkg('split-out1', 'rhel9-Baseos')},
|
|
+ {Pkg('merged-out', 'rhel9-Baseos')},
|
|
+ (9, 0), (9, 1), []),
|
|
Event(3, Action.MOVED,
|
|
- {Pkg('moved-in', 'rhel7-base')}, {Pkg('moved-out', 'rhel8-BaseOS')},
|
|
- (7, 9), (8, 0), []),
|
|
+ {Pkg('moved-in', 'rhel8-BaseOS')}, {Pkg('moved-out', 'rhel9-Baseos')},
|
|
+ (8, 10), (9, 0), []),
|
|
Event(4, Action.REMOVED,
|
|
- {Pkg('removed', 'rhel7-base')}, set(),
|
|
- (8, 0), (8, 1), []),
|
|
+ {Pkg('removed', 'rhel8-BaseOS')}, set(),
|
|
+ (9, 0), (9, 1), []),
|
|
Event(5, Action.DEPRECATED,
|
|
- {Pkg('irrelevant', 'rhel7-base')}, set(),
|
|
- (8, 0), (8, 1), []),
|
|
+ {Pkg('irrelevant', 'rhel8-BaseOS')}, set(),
|
|
+ (9, 0), (9, 1), []),
|
|
]
|
|
|
|
monkeypatch.setattr(pes_events_scanner, 'get_pes_events', lambda data_folder, json_filename: events)
|
|
@@ -242,23 +242,29 @@ def test_actor_performs(monkeypatch):
|
|
|
|
repositories_mapping = RepositoriesMapping(
|
|
mapping=[
|
|
- RepoMapEntry(source='rhel7-base', target=['rhel8-BaseOS'], ),
|
|
+ RepoMapEntry(source='rhel8-BaseOS', target=['rhel9-Baseos'], ),
|
|
],
|
|
repositories=[
|
|
- PESIDRepositoryEntry(pesid='rhel7-base', major_version='7', repoid='rhel7-repo', arch='x86_64',
|
|
- repo_type='rpm', channel='ga', rhui='', distro='rhel'),
|
|
PESIDRepositoryEntry(pesid='rhel8-BaseOS', major_version='8', repoid='rhel8-repo', arch='x86_64',
|
|
+ repo_type='rpm', channel='ga', rhui='', distro='rhel'),
|
|
+ PESIDRepositoryEntry(pesid='rhel9-Baseos', major_version='9', repoid='rhel9-repo', arch='x86_64',
|
|
repo_type='rpm', channel='ga', rhui='', distro='rhel')]
|
|
)
|
|
|
|
enabled_modules = EnabledModules(modules=[])
|
|
repo_facts = RepositoriesFacts(
|
|
- repositories=[RepositoryFile(file='', data=[RepositoryData(repoid='rhel7-repo', name='RHEL7 repo')])]
|
|
+ repositories=[RepositoryFile(file='', data=[RepositoryData(repoid='rhel8-repo', name='RHEL8 repo')])]
|
|
)
|
|
|
|
- monkeypatch.setattr(api, 'current_actor',
|
|
- CurrentActorMocked(msgs=[installed_pkgs, repositories_mapping, enabled_modules, repo_facts],
|
|
- src_ver='7.9', dst_ver='8.1'))
|
|
+ monkeypatch.setattr(
|
|
+ api,
|
|
+ "current_actor",
|
|
+ CurrentActorMocked(
|
|
+ msgs=[installed_pkgs, repositories_mapping, enabled_modules, repo_facts],
|
|
+ src_ver="8.10",
|
|
+ dst_ver="9.1",
|
|
+ ),
|
|
+ )
|
|
|
|
produced_messages = produce_mocked()
|
|
created_report = create_report_mocked()
|
|
diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos_repomap.py b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos_repomap.py
|
|
index 3286609d..763eddc6 100644
|
|
--- a/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos_repomap.py
|
|
+++ b/repos/system_upgrade/common/actors/setuptargetrepos/libraries/setuptargetrepos_repomap.py
|
|
@@ -3,7 +3,6 @@ from leapp.libraries.common.config.version import get_source_major_version, get_
|
|
from leapp.libraries.stdlib import api
|
|
|
|
DEFAULT_PESID = {
|
|
- '7': 'rhel7-base',
|
|
'8': 'rhel8-BaseOS',
|
|
'9': 'rhel9-BaseOS',
|
|
'10': 'rhel10-BaseOS'
|
|
diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py b/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py
|
|
index 30c415c0..32af8609 100644
|
|
--- a/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py
|
|
+++ b/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py
|
|
@@ -689,14 +689,14 @@ def test_get_default_repository_channels_simple(monkeypatch):
|
|
where there is only one repository enabled from the pesid family in which are
|
|
the default repositories searched in.
|
|
"""
|
|
- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(arch='x86_64', src_ver='7.9', dst_ver='8.4'))
|
|
+ monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(arch='x86_64', src_ver='8.10', dst_ver='9.6'))
|
|
repository_mapping = RepositoriesMapping(
|
|
mapping=[],
|
|
- repositories=[make_pesid_repo('rhel7-base', '7', 'rhel7-repoid-ga', channel='ga')]
|
|
+ repositories=[make_pesid_repo('rhel8-BaseOS', '8', 'rhel8-repoid-ga', channel='ga')]
|
|
)
|
|
handler = RepoMapDataHandler(repository_mapping)
|
|
|
|
- assert ['ga'] == get_default_repository_channels(handler, ['rhel7-repoid-ga'])
|
|
+ assert ['ga'] == get_default_repository_channels(handler, ['rhel8-repoid-ga'])
|
|
|
|
|
|
def test_get_default_repository_channels_highest_priority_channel(monkeypatch):
|
|
@@ -706,17 +706,17 @@ def test_get_default_repository_channels_highest_priority_channel(monkeypatch):
|
|
Verifies that the returned list contains the highest priority channel if there is a repository
|
|
with the channel enabled on the source system.
|
|
"""
|
|
- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(arch='x86_64', src_ver='7.9', dst_ver='8.4'))
|
|
+ monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(arch='x86_64', src_ver='8.10', dst_ver='9.6'))
|
|
repository_mapping = RepositoriesMapping(
|
|
mapping=[],
|
|
repositories=[
|
|
- make_pesid_repo('rhel7-base', '7', 'rhel7-repoid-ga', channel='ga'),
|
|
- make_pesid_repo('rhel7-base', '7', 'rhel7-repoid-eus', channel='eus'),
|
|
+ make_pesid_repo('rhel8-BaseOS', '8', 'rhel8-repoid-ga', channel='ga'),
|
|
+ make_pesid_repo('rhel8-BaseOS', '8', 'rhel8-repoid-eus', channel='eus'),
|
|
]
|
|
)
|
|
handler = RepoMapDataHandler(repository_mapping)
|
|
|
|
- assert ['eus', 'ga'] == get_default_repository_channels(handler, ['rhel7-repoid-ga', 'rhel7-repoid-eus'])
|
|
+ assert ['eus', 'ga'] == get_default_repository_channels(handler, ['rhel8-repoid-ga', 'rhel8-repoid-eus'])
|
|
|
|
|
|
def test_get_default_repository_channels_no_default_pesid_repo(monkeypatch):
|
|
@@ -726,12 +726,12 @@ def test_get_default_repository_channels_no_default_pesid_repo(monkeypatch):
|
|
Verifies that the returned list contains some fallback channel even if no repository from the default
|
|
pesid family in which are the channels searched is enabled.
|
|
"""
|
|
- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(arch='x86_64', src_ver='7.9', dst_ver='8.4'))
|
|
+ monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(arch='x86_64', src_ver='8.10', dst_ver='9.6'))
|
|
repository_mapping = RepositoriesMapping(
|
|
mapping=[],
|
|
repositories=[
|
|
- make_pesid_repo('rhel7-base', '7', 'rhel7-repoid-ga', channel='ga'),
|
|
- make_pesid_repo('rhel7-base', '7', 'rhel7-repoid-eus', channel='eus'),
|
|
+ make_pesid_repo('rhel8-BaseOS', '8', 'rhel8-repoid-ga', channel='ga'),
|
|
+ make_pesid_repo('rhel8-BaseOS', '8', 'rhel8-repoid-eus', channel='eus'),
|
|
]
|
|
)
|
|
handler = RepoMapDataHandler(repository_mapping)
|
|
--
|
|
2.52.0
|
|
|