Fixes #37158: Explicitly define upgrade steps in upgrade scenario

definitions/scenarios/upgrade_to_capsule_6_16.rb

@@ -25,8 +25,22 @@ class PreUpgradeCheck < Abstract
     end
 
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
+      add_steps(
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new,
+        Checks::SystemRegistration.new
+      )
+      add_steps(
+        Checks::CheckHotfixInstalled.new,
+        Checks::CheckTmout.new,
+        Checks::CheckUpstreamRepository.new,
+        Checks::Disk::AvailableSpace.new,
+        Checks::NonRhPackages.new,
+        Checks::PackageManager::Dnf::ValidateDnfConfig.new,
+        Checks::Repositories::CheckNonRhRepository.new
+      )
       add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
@@ -45,8 +59,8 @@ def compose
         :assumeyes => true,
         :dnf_options => ['--downloadonly']
       ))
-
-      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::MaintenanceMode::EnableMaintenanceMode.new)
+      add_step(Procedures::Crond::Stop.new)
     end
   end
 
@@ -74,9 +88,10 @@ class PostMigrations < Abstract
     end
 
     def compose
-      add_step(Procedures::RefreshFeatures)
+      add_step(Procedures::RefreshFeatures.new)
       add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
+      add_step(Procedures::Crond::Start.new)
+      add_step(Procedures::MaintenanceMode::DisableMaintenanceMode.new)
     end
   end
 
@@ -88,8 +103,13 @@ class PostUpgradeChecks < Abstract
     end
 
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
+      add_steps(
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new,
+        Checks::SystemRegistration.new
+      )
       add_step(Procedures::Packages::CheckForReboot)
     end
   end

definitions/scenarios/upgrade_to_capsule_6_16_z.rb

@@ -25,8 +25,22 @@ class PreUpgradeCheck < Abstract
     end
 
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
+      add_steps(
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new,
+        Checks::SystemRegistration.new
+      )
+      add_steps(
+        Checks::CheckHotfixInstalled.new,
+        Checks::CheckTmout.new,
+        Checks::CheckUpstreamRepository.new,
+        Checks::Disk::AvailableSpace.new,
+        Checks::NonRhPackages.new,
+        Checks::PackageManager::Dnf::ValidateDnfConfig.new,
+        Checks::Repositories::CheckNonRhRepository.new
+      )
       add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
@@ -45,7 +59,8 @@ def compose
         :assumeyes => true,
         :dnf_options => ['--downloadonly']
       ))
-      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::MaintenanceMode::EnableMaintenanceMode.new)
+      add_step(Procedures::Crond::Stop.new)
     end
   end
 
@@ -73,9 +88,10 @@ class PostMigrations < Abstract
     end
 
     def compose
-      add_step(Procedures::RefreshFeatures)
+      add_step(Procedures::RefreshFeatures.new)
       add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
+      add_step(Procedures::Crond::Start.new)
+      add_step(Procedures::MaintenanceMode::DisableMaintenanceMode.new)
     end
   end
 
@@ -87,8 +103,13 @@ class PostUpgradeChecks < Abstract
     end
 
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
+      add_steps(
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new,
+        Checks::SystemRegistration.new
+      )
       add_step(Procedures::Packages::CheckForReboot)
     end
   end

definitions/scenarios/upgrade_to_foreman_nightly.rb

@@ -22,10 +22,32 @@ class PreUpgradeCheck < Abstract
       run_strategy :fail_slow
     end
 
+    # rubocop:disable Metrics/MethodLength
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
+      add_steps(
+        Checks::Foreman::FactsNames.new, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage.new, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused.new, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new
+      )
+      add_steps(
+        Checks::CheckTmout.new,
+        Checks::Disk::AvailableSpace.new,
+        Checks::Foreman::ValidateExternalDbVersion.new, # if external database
+        Checks::Foreman::CheckCorruptedRoles.new,
+        Checks::Foreman::CheckDuplicatePermissions.new,
+        Checks::ForemanOpenscap::InvalidReportAssociations.new, # if foreman-openscap
+        Checks::ForemanTasks::Invalid::CheckOld.new, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPendingState.new, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPlanningState.new, # if foreman-tasks
+        Checks::ForemanTasks::NotRunning.new, # if foreman-tasks
+        Checks::PackageManager::Dnf::ValidateDnfConfig.new
+      )
     end
+    # rubocop:enable Metrics/MethodLength
   end
 
   class PreMigrations < Abstract
@@ -35,7 +57,8 @@ class PreMigrations < Abstract
     end
 
     def compose
-      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::MaintenanceMode::EnableMaintenanceMode.new)
+      add_step(Procedures::Crond::Stop.new)
     end
   end
 
@@ -68,9 +91,10 @@ class PostMigrations < Abstract
     end
 
     def compose
-      add_step(Procedures::RefreshFeatures)
+      add_step(Procedures::RefreshFeatures.new)
       add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
+      add_step(Procedures::Crond::Start.new)
+      add_step(Procedures::MaintenanceMode::DisableMaintenanceMode.new)
     end
   end
 
@@ -82,8 +106,16 @@ class PostUpgradeChecks < Abstract
     end
 
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
+      add_steps(
+        Checks::Foreman::FactsNames.new, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage.new, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused.new, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new
+      )
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

definitions/scenarios/upgrade_to_katello_nightly.rb

@@ -22,10 +22,37 @@ class PreUpgradeCheck < Abstract
       run_strategy :fail_slow
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
+      add_steps(
+        Checks::Foreman::FactsNames.new, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage.new, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused.new, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new,
+        Checks::SystemRegistration.new
+      )
+      add_steps(
+        Checks::CheckHotfixInstalled.new,
+        Checks::CheckTmout.new,
+        Checks::CheckUpstreamRepository.new,
+        Checks::Disk::AvailableSpace.new,
+        Checks::Disk::AvailableSpaceCandlepin.new, # if candlepin
+        Checks::Foreman::ValidateExternalDbVersion.new, # if external database
+        Checks::Foreman::CheckCorruptedRoles.new,
+        Checks::Foreman::CheckDuplicatePermissions.new,
+        Checks::Foreman::TuningRequirements.new, # if katello present
+        Checks::ForemanOpenscap::InvalidReportAssociations.new, # if foreman-openscap
+        Checks::ForemanTasks::Invalid::CheckOld.new, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPendingState.new, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPlanningState.new, # if foreman-tasks
+        Checks::ForemanTasks::NotRunning.new, # if foreman-tasks
+        Checks::PackageManager::Dnf::ValidateDnfConfig.new
+      )
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
   end
 
   class PreMigrations < Abstract
@@ -35,7 +62,9 @@ class PreMigrations < Abstract
     end
 
     def compose
-      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::MaintenanceMode::EnableMaintenanceMode.new)
+      add_step(Procedures::Crond::Stop.new)
+      add_step(Procedures::SyncPlans::Disable.new)
     end
   end
 
@@ -61,6 +90,7 @@ def compose
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Upgrade)
+      add_step(Procedures::Installer::UpgradeRakeTask)
     end
   end
 
@@ -73,7 +103,9 @@ class PostMigrations < Abstract
     def compose
       add_step(Procedures::RefreshFeatures)
       add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
+      add_step(Procedures::Crond::Start.new)
+      add_step(Procedures::SyncPlans::Enable.new)
+      add_step(Procedures::MaintenanceMode::DisableMaintenanceMode.new)
     end
   end
 
@@ -85,8 +117,17 @@ class PostUpgradeChecks < Abstract
     end
 
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
+      add_steps(
+        Checks::Foreman::FactsNames.new, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage.new, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused.new, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new,
+        Checks::SystemRegistration.new
+      )
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

definitions/scenarios/upgrade_to_satellite_6_16.rb

@@ -24,11 +24,40 @@ class PreUpgradeCheck < Abstract
       run_strategy :fail_slow
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
+      add_steps(
+        Checks::Foreman::FactsNames.new, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage.new, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused.new, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new,
+        Checks::SystemRegistration.new
+      )
+      add_steps(
+        Checks::CheckHotfixInstalled.new,
+        Checks::CheckTmout.new,
+        Checks::CheckUpstreamRepository.new,
+        Checks::Disk::AvailableSpace.new,
+        Checks::Disk::AvailableSpaceCandlepin.new, # if candlepin
+        Checks::Foreman::ValidateExternalDbVersion.new, # if external database
+        Checks::Foreman::CheckCorruptedRoles.new,
+        Checks::Foreman::CheckDuplicatePermissions.new,
+        Checks::Foreman::TuningRequirements.new, # if katello present
+        Checks::ForemanOpenscap::InvalidReportAssociations.new, # if foreman-openscap
+        Checks::ForemanTasks::Invalid::CheckOld.new, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPendingState.new, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPlanningState.new, # if foreman-tasks
+        Checks::ForemanTasks::NotRunning.new, # if foreman-tasks
+        Checks::NonRhPackages.new,
+        Checks::PackageManager::Dnf::ValidateDnfConfig.new,
+        Checks::Repositories::CheckNonRhRepository.new
+      )
       add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
   end
 
   class PreMigrations < Abstract
@@ -45,7 +74,9 @@ def compose
         :assumeyes => true,
         :dnf_options => ['--downloadonly']
       ))
-      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::MaintenanceMode::EnableMaintenanceMode.new)
+      add_step(Procedures::Crond::Stop.new)
+      add_step(Procedures::SyncPlans::Disable.new)
     end
   end
 
@@ -75,9 +106,11 @@ class PostMigrations < Abstract
     end
 
     def compose
-      add_step(Procedures::RefreshFeatures)
+      add_step(Procedures::RefreshFeatures.new)
       add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
+      add_step(Procedures::Crond::Start.new)
+      add_step(Procedures::SyncPlans::Enable.new)
+      add_step(Procedures::MaintenanceMode::DisableMaintenanceMode.new)
     end
   end
 
@@ -89,8 +122,16 @@ class PostUpgradeChecks < Abstract
     end
 
     def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
+      add_steps(
+        Checks::Foreman::FactsNames.new, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage.new, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax.new, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused.new, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests.new, # if puppetserver
+        Checks::ServerPing.new,
+        Checks::ServicesUp.new,
+        Checks::SystemRegistration.new
+      )
       add_step(Procedures::Packages::CheckForReboot)
     end
   end