foreman_maintain 1.6.5 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9832b114fa0e778b687140d47774ffa583742e69c0883f7e0738fad23e6d0f87
-  data.tar.gz: dfd33002a93b7171aab581342c169d0eef6cee318302bad7d24108581e05b514
+  metadata.gz: c513edc079ddea8f18904feeed2d3299c59949183703f7344946c8828abee6b6
+  data.tar.gz: 2fb58c156aaf22a0b1be982768a267926f8f080b063a2169ab6868fa1955b26d
 SHA512:
-  metadata.gz: 30c727eed2a0f6fb4402caedfcbca2b5e8466b322f94f938523e16726b9439d3b00737950d88c41993fdd61f8cedea7c67752d1917e91ff6a6dde57dfbca1544
-  data.tar.gz: fd20b2f2ea602071e1371266b62e7640b945a942208469019f0ee173ab90afd51de78e91c9790c525d1d6e689f5d47779e57ce22c032a1a1d3c53f61eb566135
+  metadata.gz: bbd8eb809ab9f165b461dd2b29e8af8b5ffdee2d285462d9a9b626e93f922ac20066d166a751524c80edbadb6c465cbb6a5661529591da7188608ff0d48467b3
+  data.tar.gz: 7450630a6ab864eec72be71fd6b948f016d59f8f1e6dcbc11c8110d41bbde62504f16acc40b9bd3ff2e5b902cd316555fb03ebf72c2606b851824fbf8d50fb6f

data/definitions/checks/repositories/validate.rb

@@ -21,7 +21,7 @@ module Checks::Repositories
       if feature(:instance).downstream.subscribed_using_activation_key?
         skip 'Your system is subscribed using custom activation key'
       else
-        @version ||= package_version(feature(:instance).downstream.package_name)
+        @version ||= package_version(feature(:instance).downstream.package_name).version
 
         with_spinner("Validating availability of repositories for #{@version}") do |spinner|
           find_absent_repos(spinner)

data/definitions/features/foreman_install.rb

@@ -6,7 +6,7 @@ class Features::ForemanInstall < ForemanMaintain::Feature
     label :foreman_install
 
     confine do
-      !feature(:instance).downstream && !feature(:katello) && feature(:foreman_server)
+      !feature(:instance).downstream && feature(:foreman_server)
     end
   end
 end

data/definitions/procedures/packages/update.rb

@@ -6,7 +6,6 @@ module Procedures::Packages
       param :force, 'Do not skip if package is installed', :flag => true, :default => false
       param :warn_on_errors, 'Do not interrupt scenario on failure',
         :flag => true, :default => false
-      param :dnf_options, 'Extra dnf options if any', :array => true, :default => []
       param :download_only, 'Download and cache packages only', :flag => true, :default => false
       param :clean_cache, 'If true will cause a DNF cache clean', :flag => true, :default => true
     end
@@ -16,7 +15,6 @@ module Procedures::Packages
       package_manager.clean_cache(:assumeyes => assumeyes_val) if @clean_cache
       opts = {
         :assumeyes => assumeyes_val,
-        :options => @dnf_options,
         :download_only => @download_only,
       }
       packages_action(:update, @packages, opts)

data/definitions/procedures/repositories/setup.rb

@@ -3,7 +3,7 @@ module Procedures::Repositories
     metadata do
       description 'Setup repositories'
       confine do
-        feature(:instance).downstream || feature(:upstream)
+        feature(:instance).downstream || feature(:instance).upstream_install
       end
       param :version,
         'Version for which repositories needs to be setup',

data/definitions/scenarios/foreman_upgrade.rb

@@ -0,0 +1,141 @@
+module Scenarios::ForemanUpgrade
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:foreman_install)
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      'nightly'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def compose
+      add_steps(
+        Checks::Foreman::FactsNames, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests, # if puppetserver
+        Checks::ServerPing,
+        Checks::ServicesUp,
+        Checks::SystemRegistration,
+        Checks::CheckHotfixInstalled,
+        Checks::CheckTmout,
+        Checks::CheckUpstreamRepository,
+        Checks::Disk::AvailableSpace,
+        Checks::Disk::AvailableSpaceCandlepin, # if candlepin
+        Checks::Foreman::ValidateExternalDbVersion, # if external database
+        Checks::Foreman::CheckCorruptedRoles,
+        Checks::Foreman::CheckDuplicatePermissions,
+        Checks::Foreman::TuningRequirements, # if katello present
+        Checks::ForemanOpenscap::InvalidReportAssociations, # if foreman-openscap
+        Checks::ForemanTasks::Invalid::CheckOld, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPendingState, # if foreman-tasks
+        Checks::ForemanTasks::Invalid::CheckPlanningState, # if foreman-tasks
+        Checks::ForemanTasks::NotRunning, # if foreman-tasks
+        Checks::NonRhPackages,
+        Checks::PackageManager::Dnf::ValidateDnfConfig,
+        Checks::Repositories::CheckNonRhRepository,
+        Checks::Repositories::Validate
+      )
+    end
+    # rubocop:enable Metrics/MethodLength
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before upgrading'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(
+        Procedures::MaintenanceMode::EnableMaintenanceMode,
+        Procedures::Crond::Stop,
+        Procedures::SyncPlans::Disable
+      )
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Upgrade steps'
+      tags :migrations
+      run_strategy :fail_fast
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Run => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => 'nightly'))
+      if el8?
+        modules_to_switch = ['postgresql:13']
+        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
+      end
+
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :download_only => true
+      ))
+      add_step(Procedures::Service::Stop.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
+
+      add_step_with_context(Procedures::Installer::Run)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Post upgrade procedures'
+      tags :post_migrations
+    end
+
+    def compose
+      add_steps(
+        Procedures::RefreshFeatures,
+        Procedures::Service::Start,
+        Procedures::Crond::Start,
+        Procedures::SyncPlans::Enable,
+        Procedures::MaintenanceMode::DisableMaintenanceMode
+      )
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(
+        Checks::Foreman::FactsNames, # if Foreman database present
+        Checks::ForemanProxy::CheckTftpStorage, # if Satellite with foreman-proxy+tftp
+        Checks::ForemanProxy::VerifyDhcpConfigSyntax, # if foreman-proxy+dhcp-isc
+        Checks::ForemanTasks::NotPaused, # if foreman-tasks present
+        Checks::Puppet::VerifyNoEmptyCacertRequests, # if puppetserver
+        Checks::ServerPing,
+        Checks::ServicesUp,
+        Checks::SystemRegistration,
+        Procedures::Packages::CheckForReboot
+      )
+    end
+  end
+end

data/definitions/scenarios/update.rb

@@ -59,7 +59,7 @@ module Scenarios::Update
       add_steps(
         Procedures::Packages::Update.new(
           :assumeyes => true,
-          :dnf_options => ['--downloadonly']
+          :download_only => true
         ),
         Procedures::MaintenanceMode::EnableMaintenanceMode,
         Procedures::Crond::Stop,

data/lib/foreman_maintain/cli/update_command.rb

@@ -26,8 +26,9 @@ module ForemanMaintain
         def execute
           ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade unless disable_self_update?
-          update_runner.run_phase(:pre_update_checks)
-          exit update_runner.exit_code
+          runner = update_runner
+          runner.run_phase(:pre_update_checks)
+          exit runner.exit_code
         end
       end
 
@@ -38,9 +39,10 @@ module ForemanMaintain
         def execute
           ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade unless disable_self_update?
-          update_runner.run
-          update_runner.save
-          exit update_runner.exit_code
+          runner = update_runner
+          runner.run
+          runner.save
+          exit runner.exit_code
         end
       end
     end

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -108,7 +108,6 @@ module ForemanMaintain
           package_manager.update(
             packages,
             :assumeyes => options[:assumeyes],
-            :options => options[:options],
             :download_only => options[:download_only]
           )
         when :remove

data/lib/foreman_maintain/package_manager/apt.rb

@@ -19,15 +19,13 @@ module ForemanMaintain::PackageManager
       apt_action('remove', packages, :assumeyes => assumeyes)
     end
 
-    # rubocop:disable Lint/UnusedMethodArgument
-    def update(packages = [], assumeyes: false, options: [], download_only: false)
+    def update(packages = [], assumeyes: false, download_only: false)
       action = packages.any? ? '--only-upgrade install' : 'upgrade'
       apt_action(action, packages, :assumeyes => assumeyes, :download_only => download_only)
     end
-    # rubocop:enable Lint/UnusedMethodArgument
 
     def clean_cache(assumeyes: false)
-      apt_action('clean', :assumeyes => assumeyes)
+      apt_action('clean', [], :assumeyes => assumeyes)
     end
 
     def find_installed_package(name, queryfm = '')

data/lib/foreman_maintain/package_manager/base.rb

@@ -60,8 +60,6 @@ module ForemanMaintain::PackageManager
       false
     end
 
-    private
-
     def sys
       ForemanMaintain::Utils::SystemHelpers
     end

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -59,12 +59,11 @@ module ForemanMaintain::PackageManager
       dnf_action('remove', packages, assumeyes: assumeyes)
     end
 
-    def update(packages = [], assumeyes: false, options: [], download_only: false)
+    def update(packages = [], assumeyes: false, download_only: false)
       dnf_action(
         'update',
         packages,
         assumeyes: assumeyes,
-        dnf_options: options,
         download_only: download_only
       )
     end
@@ -138,7 +137,7 @@ module ForemanMaintain::PackageManager
       packages = [packages].flatten(1)
 
       dnf_options << '-y' if assumeyes
-      dnf_topions << '--downloadonly' if download_only
+      dnf_options << '--downloadonly' if download_only
       dnf_options << '--disableplugin=foreman-protector'
 
       command = ['dnf', dnf_options.join(' '), action]

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.6.5'.freeze
+  VERSION = '1.6.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.7
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -310,6 +310,7 @@ files:
 - definitions/procedures/sync_plans/disable.rb
 - definitions/procedures/sync_plans/enable.rb
 - definitions/scenarios/backup.rb
+- definitions/scenarios/foreman_upgrade.rb
 - definitions/scenarios/maintenance_mode.rb
 - definitions/scenarios/packages.rb
 - definitions/scenarios/puppet.rb
@@ -319,8 +320,6 @@ files:
 - definitions/scenarios/update.rb
 - definitions/scenarios/upgrade_to_capsule_6_16.rb
 - definitions/scenarios/upgrade_to_capsule_6_16_z.rb
-- definitions/scenarios/upgrade_to_foreman_nightly.rb
-- definitions/scenarios/upgrade_to_katello_nightly.rb
 - definitions/scenarios/upgrade_to_satellite_6_16.rb
 - definitions/scenarios/upgrade_to_satellite_6_16_z.rb
 - extras/foreman-maintain.sh

data/definitions/scenarios/upgrade_to_foreman_nightly.rb

@@ -1,91 +0,0 @@
-module Scenarios::Foreman_Nightly
-  class Abstract < ForemanMaintain::Scenario
-    def self.upgrade_metadata(&block)
-      metadata do
-        tags :upgrade_scenario
-        confine do
-          feature(:foreman_install) || ForemanMaintain.upgrade_in_progress == 'nightly'
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      'nightly'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Foreman nightly'
-      tags :pre_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before upgrading to Foreman nightly'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_steps(find_procedures(:pre_migrations))
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Upgrade steps for Foreman nightly'
-      tags :migrations
-      run_strategy :fail_fast
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Run => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => 'nightly'))
-      if el8?
-        modules_to_switch = ['postgresql:13']
-        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["foreman:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step_with_context(Procedures::Installer::Run)
-    end
-  end
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Post upgrade procedures for Foreman nightly'
-      tags :post_migrations
-    end
-
-    def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
-    end
-  end
-
-  class PostUpgradeChecks < Abstract
-    upgrade_metadata do
-      description 'Checks after upgrading to Foreman nightly'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-    end
-  end
-end

data/definitions/scenarios/upgrade_to_katello_nightly.rb

@@ -1,96 +0,0 @@
-module Scenarios::Katello_Nightly
-  class Abstract < ForemanMaintain::Scenario
-    def self.upgrade_metadata(&block)
-      metadata do
-        tags :upgrade_scenario
-        confine do
-          feature(:katello_install) || ForemanMaintain.upgrade_in_progress == 'nightly'
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      'nightly'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Katello nightly'
-      tags :pre_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before upgrading to Katello nightly'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_steps(find_procedures(:pre_migrations))
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Upgrade steps for Katello nightly'
-      tags :migrations
-      run_strategy :fail_fast
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Run => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => 'nightly'))
-      if el8?
-        modules_to_switch = ['postgresql:13']
-        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["katello:#{el_short_name}", "pulpcore:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :download_only => true
-      ))
-      add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
-      add_step_with_context(Procedures::Installer::Run)
-    end
-  end
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Post upgrade procedures for Katello nightly'
-      tags :post_migrations
-    end
-
-    def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
-    end
-  end
-
-  class PostUpgradeChecks < Abstract
-    upgrade_metadata do
-      description 'Checks after upgrading to Katello nightly'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-    end
-  end
-end