From 28a5cc0d49451592f5184c25d155f5e7be81f17e Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 20 Nov 2023 14:35:03 +0100 Subject: [PATCH 42/60] BZ#2250254 - force removal of tomcat during the upgrade We need pki-servlet-engine, which we depend on, but tomcat conflicts with. --- .../el7toel8/actors/satellite_upgrade_facts/actor.py | 6 ++++++ 1 file changed, 6 insertions(+) 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 01e63465..3cd9d9da 100644 --- a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py +++ b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py @@ -42,6 +42,7 @@ class SatelliteUpgradeFacts(Actor): postgresql_contrib = has_package(InstalledRPM, 'rh-postgresql12-postgresql-contrib') postgresql_evr = has_package(InstalledRPM, 'rh-postgresql12-postgresql-evr') + # SCL-related packages to_remove = ['tfm-runtime', 'tfm-pulpcore-runtime', 'rh-redis5-runtime', 'rh-ruby27-runtime', 'rh-python38-runtime'] to_install = ['rubygem-foreman_maintain'] @@ -54,6 +55,11 @@ class SatelliteUpgradeFacts(Actor): # enable modules that are needed for Pulpcore modules_to_enable.append(Module(name='python38', stream='3.8')) to_install.append('katello') + # Force removal of tomcat + # PES data indicates tomcat.el7 can be upgraded to tomcat.el8 since EL 8.8, + # but we need pki-servlet-engine from the module instead which will be pulled in via normal + # package dependencies + to_remove.extend(['tomcat', 'tomcat-lib']) if has_package(InstalledRPM, 'rh-redis5-redis'): modules_to_enable.append(Module(name='redis', stream='5')) -- 2.43.0