From ce02fa83a2f3cff089133ed9bb05dbdd6755132d Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 17 May 2022 15:01:23 +0200 Subject: [PATCH 27/39] BZ#2087144 - do not enable Ansible repository when upgrading Satellite Having it enabled, confuses the upgrade as there is now also ansible-core in RHEL 8.6 and we need to upgrade to that instead of legacy Ansible from the dedicated repository. --- .../el7toel8/actors/satellite_upgrade_facts/actor.py | 3 +-- .../tests/unit_test_satellite_upgrade_facts.py | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py index fb83107e..12c0fa53 100644 --- a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py +++ b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py @@ -129,8 +129,7 @@ class SatelliteUpgradeFacts(Actor): modules_to_enable=modules_to_enable ) ) - repositories_to_enable = ['ansible-2.9-for-rhel-8-x86_64-rpms', - 'satellite-maintenance-6.11-for-rhel-8-x86_64-rpms'] + repositories_to_enable = ['satellite-maintenance-6.11-for-rhel-8-x86_64-rpms'] if has_package(InstalledRPM, 'foreman'): repositories_to_enable.append('satellite-6.11-for-rhel-8-x86_64-rpms') else: diff --git a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/tests/unit_test_satellite_upgrade_facts.py b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/tests/unit_test_satellite_upgrade_facts.py index e77b7b58..28b9f44b 100644 --- a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/tests/unit_test_satellite_upgrade_facts.py +++ b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/tests/unit_test_satellite_upgrade_facts.py @@ -103,7 +103,6 @@ def test_enables_right_repositories_on_satellite(current_actor_context): rpmmessage = current_actor_context.consume(RepositoriesSetupTasks)[0] - assert 'ansible-2.9-for-rhel-8-x86_64-rpms' in rpmmessage.to_enable assert 'satellite-maintenance-6.11-for-rhel-8-x86_64-rpms' in rpmmessage.to_enable assert 'satellite-6.11-for-rhel-8-x86_64-rpms' in rpmmessage.to_enable assert 'satellite-capsule-6.11-for-rhel-8-x86_64-rpms' not in rpmmessage.to_enable @@ -115,7 +114,6 @@ def test_enables_right_repositories_on_capsule(current_actor_context): rpmmessage = current_actor_context.consume(RepositoriesSetupTasks)[0] - assert 'ansible-2.9-for-rhel-8-x86_64-rpms' in rpmmessage.to_enable assert 'satellite-maintenance-6.11-for-rhel-8-x86_64-rpms' in rpmmessage.to_enable assert 'satellite-6.11-for-rhel-8-x86_64-rpms' not in rpmmessage.to_enable assert 'satellite-capsule-6.11-for-rhel-8-x86_64-rpms' in rpmmessage.to_enable -- 2.35.3