foreman_maintain 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d9b46e0f2566916075ef7ec1972734f31919fafaa10ce814a2e5006ece9ab62
-  data.tar.gz: 989952ede4062aaba32b380a5226b63e9aaa0c22ffbf34b79bc80a153a0b0920
+  metadata.gz: 100d751c774b8d059da095d52e16b0f550d07cfc452dde7416c02268dceceea0
+  data.tar.gz: 4d321b112aed2dd01a6f4175a66ce0f70a58b40a66da9b476bda3eb12a4697ca
 SHA512:
-  metadata.gz: a9a380eb151bfadbbba33824d438dc69fe47732cf3219af14b8e78ebcb2bb8dd5ba590fc9887d936aa1eb662e644f8e085a39c2023a71e5d3d975075d37a57bb
-  data.tar.gz: 7725d0d13f08191822fbda79b828498d8b064a984ca8d38a841d1e400768ec6c530ea8d99c94ea35f6a62ac547455de32a9d4048d06a3d4a953fd065908385d1
+  metadata.gz: 3b1760b02ab02ad1918de24f7aef1f761cf24aefb76ab0191d360cd14b430255926fff5971b349f7f18cd0736664add545af2a3a0a04b73e3e6e71a7b75952ae
+  data.tar.gz: 806f8f9c132c662b9e5a812520589a59c4986783b1962389705d5743f901bfd157c5fb9bf4c16455c80678d3033648d6f0ee36f41045bbbae59e097d62381624

data/definitions/checks/foreman_tasks/not_paused.rb

@@ -9,7 +9,7 @@ module Checks::ForemanTasks
     end
 
     def run
-      paused_tasks_count = feature(:foreman_tasks).paused_tasks_count()
+      paused_tasks_count = feature(:foreman_tasks).paused_tasks_count
       assert(paused_tasks_count == 0,
         "There are currently #{paused_tasks_count} paused tasks in the system",
         :next_steps => next_procedures)

data/definitions/checks/package_manager/dnf/validate_dnf_config.rb

@@ -19,7 +19,7 @@ module Checks::PackageManager
 
       # rubocop:disable Metrics/LineLength
       def failure_message(final_result)
-        verb_string = final_result[:matched_keys].length > 1 ? 'are' : 'is'
+        verb_string = (final_result[:matched_keys].length > 1) ? 'are' : 'is'
 
         "#{final_result[:matched_keys].join(',')} #{verb_string} set in /etc/dnf/dnf.conf as below:"\
         "\n#{final_result[:grep_output]}"\

data/definitions/features/candlepin_database.rb

@@ -14,7 +14,7 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
   def services
     [
       system_service('postgresql', 10, :component => 'candlepin',
-                                       :db_feature => feature(:candlepin_database)),
+        :db_feature => feature(:candlepin_database)),
     ]
   end
 

data/definitions/features/foreman_database.rb

@@ -28,7 +28,7 @@ class Features::ForemanDatabase < ForemanMaintain::Feature
   def services
     [
       system_service('postgresql', 10, :component => 'foreman',
-                                       :db_feature => feature(:foreman_database)),
+        :db_feature => feature(:foreman_database)),
     ]
   end
 

data/definitions/features/installer.rb

@@ -30,7 +30,6 @@ class Features::Installer < ForemanMaintain::Feature
   def config_files
     Dir.glob(File.join(config_directory, '**/*')) +
       [
-        '/usr/local/bin/validate_postgresql_connection.sh',
         '/opt/puppetlabs/puppet/cache/foreman_cache_data',
         '/opt/puppetlabs/puppet/cache/pulpcore_cache_data',
       ]

data/definitions/features/pulpcore.rb

@@ -19,7 +19,7 @@ class Features::Pulpcore < ForemanMaintain::Feature
     names = names.map { |f| File.basename(f) }
     names.map do |name|
       system_service(name, 20, :skip_enablement => true,
-                               :instance_parent_unit => 'pulpcore-worker@')
+        :instance_parent_unit => 'pulpcore-worker@')
     end
   end
 

data/definitions/features/pulpcore_database.rb

@@ -20,7 +20,7 @@ class Features::PulpcoreDatabase < ForemanMaintain::Feature
   def services
     [
       system_service('postgresql', 10, :component => 'pulpcore',
-                                       :db_feature => feature(:pulpcore_database)),
+        :db_feature => feature(:pulpcore_database)),
     ]
   end
 

data/definitions/features/service.rb

@@ -15,7 +15,7 @@ class Features::Service < ForemanMaintain::Feature
     ForemanMaintain.available_features.flat_map(&:services).
       sort.
       inject([]) do |pool, service| # uniq(&:to_s) for ruby 1.8.7
-        pool.last.nil? || !pool.last.matches?(service) ? pool << service : pool
+        (pool.last.nil? || !pool.last.matches?(service)) ? pool << service : pool
       end.
       select(&:exist?)
   end
@@ -109,7 +109,7 @@ class Features::Service < ForemanMaintain::Feature
   end
 
   def format_brief_status(exit_code)
-    result = exit_code == 0 ? reporter.status_label(:success) : reporter.status_label(:fail)
+    result = (exit_code == 0) ? reporter.status_label(:success) : reporter.status_label(:fail)
     padding = reporter.max_length - reporter.last_line.to_s.length - 30
     "#{' ' * padding} #{result}"
   end

data/definitions/procedures/backup/offline/foreman_db.rb

@@ -33,7 +33,7 @@ module Procedures::Backup
       def local_backup
         with_spinner("Collecting data from #{pg_data_dirs.join(',')}") do
           pg_data_dirs.each_with_index do |pg_dir, index|
-            do_backup(pg_dir, index == 0 ? 'create' : 'append')
+            do_backup(pg_dir, (index == 0) ? 'create' : 'append')
           end
         end
       end

data/definitions/procedures/backup/online/safety_confirmation.rb

@@ -5,7 +5,7 @@ module Procedures::Backup
         description 'Data consistency warning'
         tags :backup
         param :include_db_dumps, 'Are database dumps included in backup', :flag => true,
-                                                                          :default => false
+          :default => false
       end
 
       def run

data/definitions/procedures/backup/snapshot/mount_base.rb

@@ -14,7 +14,7 @@ module Procedures::Backup
 
       def mount_snapshot(database, lv_type)
         FileUtils.mkdir_p(mount_location(database))
-        options = lv_type == 'xfs' ? '-onouuid,ro' : '-oro'
+        options = (lv_type == 'xfs') ? '-onouuid,ro' : '-oro'
         lv_name = "#{database}-snap"
         execute!("mount #{get_lv_path(lv_name)} #{mount_location(database)} #{options}")
       end

data/definitions/procedures/foreman/fix_corrupted_roles.rb

@@ -26,7 +26,7 @@ module Procedures::Foreman
 
     def find_records_to_update(inconsistent_sets)
       largest_set = inconsistent_sets.reduce([]) do |memo, set|
-        set.count > memo.count ? set : memo
+        (set.count > memo.count) ? set : memo
       end
 
       inconsistent_sets.reject do |set|

data/definitions/procedures/maintenance_mode/is_enabled.rb

@@ -12,7 +12,7 @@ module Procedures::MaintenanceMode
 
     def run
       @status_code = feature(:instance).firewall.maintenance_mode_status? ? 0 : 1
-      puts "Maintenance mode is #{@status_code == 1 ? 'Off' : 'On'}"
+      puts "Maintenance mode is #{(@status_code == 1) ? 'Off' : 'On'}"
     end
   end
 end

data/definitions/procedures/packages/check_for_reboot.rb

@@ -7,7 +7,7 @@ module Procedures::Packages
     def run
       status, output = execute_with_status('dnf needs-restarting --reboothint')
       if status == 1
-        set_status(:warning, output)
+        set_info_warn(output)
       else
         set_status(:success, output)
       end

data/definitions/scenarios/backup.rb

@@ -195,7 +195,7 @@ module ForemanMaintain::Scenarios
 
     def add_online_backup_steps
       add_step_with_context(Procedures::Backup::ConfigFiles, :ignore_changed_files => true,
-                                                             :online_backup => true)
+        :online_backup => true)
       add_step_with_context(Procedures::Backup::Pulp, :ensure_unchanged => true)
       add_steps_with_context(
         Procedures::Backup::Online::CandlepinDB,

data/definitions/scenarios/{upgrade_to_capsule_6_15_z.rb → upgrade_to_capsule_6_16.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Capsule_6_15_z
+module Scenarios::Capsule_6_16
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Capsule_6_15_z
         confine do
           feature(:capsule) &&
             (feature(:capsule).current_minor_version == '6.15' || \
-              ForemanMaintain.upgrade_in_progress == '6.15.z')
+            ForemanMaintain.upgrade_in_progress == '6.16')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.15.z'
+      '6.16'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.15.z'
+      description 'Checks before upgrading to Capsule 6.16'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Capsule_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.15.z'
+      description 'Procedures before migrating to Capsule 6.16'
       tags :pre_migrations
     end
 
@@ -44,7 +44,7 @@ module Scenarios::Capsule_6_15_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.15.z'
+      description 'Migration scripts to Capsule 6.16'
       tags :migrations
     end
 
@@ -53,7 +53,7 @@ module Scenarios::Capsule_6_15_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
       modules_to_enable = ["satellite-capsule:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -66,7 +66,7 @@ module Scenarios::Capsule_6_15_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.15.z'
+      description 'Procedures after migrating to Capsule 6.16'
       tags :post_migrations
     end
 
@@ -79,7 +79,7 @@ module Scenarios::Capsule_6_15_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.15.z'
+      description 'Checks after upgrading to Capsule 6.16'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_capsule_6_15.rb → upgrade_to_capsule_6_16_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Capsule_6_15
+module Scenarios::Capsule_6_16_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.14' || \
-            ForemanMaintain.upgrade_in_progress == '6.15')
+            (feature(:capsule).current_minor_version == '6.16' || \
+              ForemanMaintain.upgrade_in_progress == '6.16.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.15'
+      '6.16.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.15'
+      description 'Checks before upgrading to Capsule 6.16.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Capsule_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.15'
+      description 'Procedures before migrating to Capsule 6.16.z'
       tags :pre_migrations
     end
 
@@ -44,7 +44,7 @@ module Scenarios::Capsule_6_15
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.15'
+      description 'Migration scripts to Capsule 6.16.z'
       tags :migrations
     end
 
@@ -53,7 +53,7 @@ module Scenarios::Capsule_6_15
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
       modules_to_enable = ["satellite-capsule:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -66,7 +66,7 @@ module Scenarios::Capsule_6_15
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.15'
+      description 'Procedures after migrating to Capsule 6.16.z'
       tags :post_migrations
     end
 
@@ -79,7 +79,7 @@ module Scenarios::Capsule_6_15
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.15'
+      description 'Checks after upgrading to Capsule 6.16.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_6_15_z.rb → upgrade_to_satellite_6_16.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Satellite_6_15_z
+module Scenarios::Satellite_6_16
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Satellite_6_15_z
         confine do
           feature(:satellite) &&
             (feature(:satellite).current_minor_version == '6.15' || \
-            ForemanMaintain.upgrade_in_progress == '6.15.z')
+            ForemanMaintain.upgrade_in_progress == '6.16')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.15.z'
+      '6.16'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.15.z'
+      description 'Checks before upgrading to Satellite 6.16'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Satellite_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.15.z'
+      description 'Procedures before migrating to Satellite 6.16'
       tags :pre_migrations
     end
 
@@ -44,8 +44,9 @@ module Scenarios::Satellite_6_15_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.15.z'
+      description 'Migration scripts to Satellite 6.16'
       tags :migrations
+      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -53,7 +54,7 @@ module Scenarios::Satellite_6_15_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
       modules_to_enable = ["satellite:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -67,7 +68,7 @@ module Scenarios::Satellite_6_15_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.15.z'
+      description 'Procedures after migrating to Satellite 6.16'
       tags :post_migrations
     end
 
@@ -80,7 +81,7 @@ module Scenarios::Satellite_6_15_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.15.z'
+      description 'Checks after upgrading to Satellite 6.16'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_6_15.rb → upgrade_to_satellite_6_16_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Satellite_6_15
+module Scenarios::Satellite_6_16_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '6.14' || \
-            ForemanMaintain.upgrade_in_progress == '6.15')
+            (feature(:satellite).current_minor_version == '6.16' || \
+            ForemanMaintain.upgrade_in_progress == '6.16.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.15'
+      '6.16.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.15'
+      description 'Checks before upgrading to Satellite 6.16.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Satellite_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.15'
+      description 'Procedures before migrating to Satellite 6.16.z'
       tags :pre_migrations
     end
 
@@ -44,9 +44,8 @@ module Scenarios::Satellite_6_15
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.15'
+      description 'Migration scripts to Satellite 6.16.z'
       tags :migrations
-      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -54,7 +53,7 @@ module Scenarios::Satellite_6_15
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
       modules_to_enable = ["satellite:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
@@ -68,7 +67,7 @@ module Scenarios::Satellite_6_15
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.15'
+      description 'Procedures after migrating to Satellite 6.16.z'
       tags :post_migrations
     end
 
@@ -81,7 +80,7 @@ module Scenarios::Satellite_6_15
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.15'
+      description 'Checks after upgrading to Satellite 6.16.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -90,7 +90,7 @@ module ForemanMaintain
                      ' --no-privileges --clean --disable-triggers -n public ' \
                      "-d #{config['database']} #{file}"
           execute!(dump_cmd, :hidden_patterns => [config['password']],
-                             :valid_exit_statuses => [0, 1])
+            :valid_exit_statuses => [0, 1])
         end
       end
 

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -106,7 +106,7 @@ module ForemanMaintain
           package_manager.install(packages, :assumeyes => options[:assumeyes])
         when :update
           package_manager.update(packages, :assumeyes => options[:assumeyes],
-                                           :dnf_options => options[:dnf_options])
+            :dnf_options => options[:dnf_options])
         when :remove
           package_manager.remove(packages, :assumeyes => options[:assumeyes])
         else

data/lib/foreman_maintain/executable.rb

@@ -5,7 +5,7 @@ module ForemanMaintain
     attr_reader :options
 
     def_delegators :execution,
-      :success?, :skipped?, :fail?, :aborted?, :warning?, :output,
+      :success?, :skipped?, :fail?, :aborted?, :warning?, :info_warning?, :output,
       :assumeyes?, :whitelisted?, :ask_decision,
       :execution, :puts, :print, :with_spinner, :ask, :storage
 
@@ -91,6 +91,10 @@ module ForemanMaintain
       set_status(:warning, message)
     end
 
+    def set_info_warn(message)
+      set_status(:info_warning, message)
+    end
+
     def set_skip(message)
       set_status(:skipped, message)
     end
@@ -173,7 +177,7 @@ module ForemanMaintain
       raise "The step is not matching the hash #{hash.inspect}" unless matches_hash?(hash)
       raise "Can't update step that was already executed" if @_execution
       @_execution = Runner::StoredExecution.new(self, :status => hash[:status],
-                                                      :output => hash[:output])
+        :output => hash[:output])
     end
 
     def inspect

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -228,7 +228,7 @@ module ForemanMaintain
         end
 
         until_valid_decision do
-          actions = run_strategy == :fail_slow ? 'n(next)' : 'n(next), q(quit)'
+          actions = (run_strategy == :fail_slow) ? 'n(next)' : 'n(next), q(quit)'
           answer = ask("#{message}, [#{actions}]")
           if answer =~ /^\d+$/ && (answer.to_i - 1) < steps.size
             steps[answer.to_i - 1]
@@ -276,7 +276,8 @@ module ForemanMaintain
                     :running => { :label => '[RUNNING]', :color => :blue },
                     :skipped => { :label => '[SKIPPED]', :color => :yellow },
                     :already_run => { :label => '[ALREADY RUN]', :color => :yellow },
-                    :warning => { :label => '[WARNING]', :color => :yellow } }
+                    :warning => { :label => '[WARNING]', :color => :yellow },
+                    :info_warning => { :label => '[WARNING]', :color => :yellow } }
         properties = mapping[status]
         if @plaintext
           properties[:label]

data/lib/foreman_maintain/reporter.rb

@@ -113,7 +113,7 @@ module ForemanMaintain
         return steps.first
       end
       until_valid_decision do
-        actions = run_strategy == :fail_slow ? 'n(next)' : 'n(next), q(quit)'
+        actions = (run_strategy == :fail_slow) ? 'n(next)' : 'n(next), q(quit)'
 
         answer = ask("#{message}, [#{actions}]")
         if answer =~ /^\d+$/ && (answer.to_i - 1) < steps.size

data/lib/foreman_maintain/runner/execution.rb

@@ -63,6 +63,10 @@ module ForemanMaintain
         @status == :warning
       end
 
+      def info_warning?
+        @status == :info_warning
+      end
+
       # yaml storage to preserve key/value pairs between runs.
       def storage
         @storage || ForemanMaintain.storage(:default)

data/lib/foreman_maintain/scenario.rb

@@ -119,6 +119,10 @@ module ForemanMaintain
       filter_whitelisted(executed_steps.find_all(&:warning?), options)
     end
 
+    def steps_with_info_warning(options = {})
+      filter_whitelisted(executed_steps.find_all(&:info_warning?), options)
+    end
+
     def steps_with_skipped(options = {})
       filter_whitelisted(executed_steps.find_all(&:skipped?), options)
     end
@@ -143,6 +147,10 @@ module ForemanMaintain
       !steps_with_warning(:whitelisted => false).empty?
     end
 
+    def info_warning?
+      !steps_with_info_warning(:whitelisted => false).empty?
+    end
+
     def failed?
       !passed?
     end

data/lib/foreman_maintain/utils/service/abstract.rb

@@ -18,7 +18,7 @@ module ForemanMaintain::Utils
 
       def <=>(other)
         prio_cmp = @priority <=> other.priority
-        prio_cmp == 0 ? @name <=> other.name : prio_cmp
+        (prio_cmp == 0) ? @name <=> other.name : prio_cmp
       end
 
       def to_s

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.4.3'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/lib/foreman_maintain/yaml_storage.rb

@@ -47,7 +47,7 @@ module ForemanMaintain
       end
 
       def save_all
-        storage_register.values.each(&:save)
+        storage_register.each_value(&:save)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -181,7 +181,6 @@ files:
 - definitions/checks/foreman_tasks/invalid/check_planning_state.rb
 - definitions/checks/foreman_tasks/not_paused.rb
 - definitions/checks/foreman_tasks/not_running.rb
-- definitions/checks/katello_agent.rb
 - definitions/checks/maintenance_mode/check_consistency.rb
 - definitions/checks/non_rh_packages.rb
 - definitions/checks/package_manager/dnf/validate_dnf_config.rb
@@ -327,12 +326,12 @@ files:
 - definitions/scenarios/restore.rb
 - definitions/scenarios/self_upgrade.rb
 - definitions/scenarios/services.rb
-- definitions/scenarios/upgrade_to_capsule_6_15.rb
-- definitions/scenarios/upgrade_to_capsule_6_15_z.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_15.rb
-- definitions/scenarios/upgrade_to_satellite_6_15_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_16.rb
+- definitions/scenarios/upgrade_to_satellite_6_16_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/dnf/foreman-protector.py
 - extras/foreman_protector/foreman-protector.conf

data/definitions/checks/katello_agent.rb

@@ -1,41 +0,0 @@
-require 'yaml'
-
-class Checks::CheckKatelloAgentEnabled < ForemanMaintain::Check
-  metadata do
-    label :check_katello_agent_enabled
-    description 'Check whether the katello-agent feature is enabled before upgrading'
-    tags :pre_upgrade
-
-    confine do
-      !feature(:capsule)
-    end
-  end
-
-  def run
-    instance_name = feature(:instance).downstream ? "Satellite" : "Katello"
-    instance_version = feature(:instance).downstream ? "6.15" : "4.10"
-    installer_command = feature(:instance).downstream ? "satellite-installer" : "foreman-installer"
-    maintain_command = feature(:instance).downstream ? "satellite-maintain" : "foreman-maintain"
-
-    assert(
-      !katello_agent_enabled?,
-      "The katello-agent feature is enabled on this system. As of #{instance_name}"\
-      " #{instance_version}, katello-agent is removed and will no longer function."\
-      " Before proceeding with the upgrade, you should ensure that you have deployed"\
-      " and configured an alternative tool for remote package management and patching"\
-      " for content hosts, such as Remote Execution (REX) with pull-based transport."\
-      " See the Managing Hosts guide in the #{instance_name} documentation for more info."\
-      " Disable katello-agent with the command"\
-      " `#{installer_command} --foreman-proxy-content-enable-katello-agent false`"\
-      " before proceeding with the upgrade. Alternatively, you may skip this check and proceed by"\
-      " running #{maintain_command} again with the `--whitelist` option, which will automatically"\
-      " uninstall katello-agent."
-    )
-  end
-
-  private
-
-  def katello_agent_enabled?
-    feature(:installer).answers['foreman_proxy_content']['enable_katello_agent']
-  end
-end