foreman_maintain 0.6.15 → 0.7.5

data/lib/foreman_maintain.rb

@@ -155,7 +155,7 @@ module ForemanMaintain
     def pkg_and_cmd_name
       instance_feature = ForemanMaintain.available_features(:label => :instance).first
       if instance_feature.downstream
-        return %w[satellite-maintain satellite-maintain]
+        return instance_feature.downstream.fm_pkg_and_cmd_name
       end
 
       [main_package_name, 'foreman-maintain']

data/lib/foreman_maintain/cli.rb

@@ -27,6 +27,14 @@ module ForemanMaintain
       subcommand 'content', 'Content related commands', ContentCommand
       subcommand 'maintenance-mode', 'Control maintenance-mode for application',
                  MaintenanceModeCommand
+      if ForemanMaintain.detector.feature(:satellite) &&
+         ForemanMaintain.detector.feature(:satellite).current_minor_version == '6.9'
+        subcommand 'prep-6.10-upgrade', 'Preparations for the Satellite 6.10 upgrade' do
+          def execute
+            run_scenarios_and_exit(Scenarios::Prep610Upgrade.new)
+          end
+        end
+      end
 
       def run(*arguments)
         logger.info("Running foreman-maintain command with arguments #{arguments.inspect}")

data/lib/foreman_maintain/cli/content_command.rb

@@ -7,9 +7,24 @@ module ForemanMaintain
         end
       end
 
-      subcommand 'switchover', 'Switch support for certain content from Pulp 2 to Pulp 3' do
+      unless ForemanMaintain.detector.feature(:satellite) ||
+             ForemanMaintain.detector.feature(:capsule)
+        subcommand 'switchover', 'Switch support for certain content from Pulp 2 to Pulp 3' do
+          def execute
+            run_scenarios_and_exit(Scenarios::Content::Switchover.new)
+          end
+        end
+      end
+
+      subcommand 'prepare-abort', 'Abort all running Pulp 2 to Pulp 3 migration tasks' do
+        def execute
+          run_scenarios_and_exit(Scenarios::Content::PrepareAbort.new)
+        end
+      end
+
+      subcommand 'migration-stats', 'Retrieve Pulp 2 to Pulp 3 migration statistics' do
         def execute
-          run_scenarios_and_exit(Scenarios::Content::Switchover.new)
+          run_scenarios_and_exit(Scenarios::Content::MigrationStats.new)
         end
       end
     end

data/lib/foreman_maintain/concerns/downstream.rb

@@ -54,6 +54,10 @@ module ForemanMaintain
         raise NotImplementedError
       end
 
+      def fm_pkg_and_cmd_name
+        %w[satellite-maintain satellite-maintain]
+      end
+
       private
 
       def rh_repos(server_version)

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -8,6 +8,7 @@ module ForemanMaintain::PackageManager
     private
 
     def dnf_action(action, packages, with_status: false, assumeyes: false)
+      packages = [packages].flatten(1)
       yum_options = []
       yum_options << '-y' if assumeyes
       if with_status

data/lib/foreman_maintain/reporter.rb

@@ -22,12 +22,13 @@ module ForemanMaintain
 
     def after_scenario_finishes(_scenario); end
 
-    def on_next_steps(steps)
+    def on_next_steps(steps, run_strategy = :fail_fast)
       return if steps.empty?
+
       if steps.size > 1
-        multiple_steps_decision(steps)
+        multiple_steps_decision(steps, run_strategy)
       else
-        single_step_decision(steps.first)
+        single_step_decision(steps.first, run_strategy)
       end
     end
 
@@ -46,17 +47,19 @@ module ForemanMaintain
     end
 
     # simple yes/no question, returns :yes, :no or :quit
-    def ask_decision(message, options = {})
-      options.validate_options!(:assumeyes)
-      assumeyes = options.fetch(:assumeyes, assumeyes?)
+    # rubocop:disable Metrics/LineLength
+    def ask_decision(message, actions_msg: 'y(yes), n(no), q(quit)', assumeyes: assumeyes?, run_strategy: :fail_fast)
+      actions_msg = 'y(yes), n(no)' if run_strategy == :fail_slow
       if assumeyes
         print("#{message} (assuming yes)")
         return :yes
       end
+
       until_valid_decision do
-        filter_decision(ask("#{message}, [y(yes), n(no), q(quit)]"))
+        filter_decision(ask("#{message}, [#{actions_msg}]"))
       end
     end
+    # rubocop:enable Metrics/LineLength
 
     def assumeyes=(assume)
       @assumeyes = !!assume
@@ -64,8 +67,8 @@ module ForemanMaintain
 
     private
 
-    def single_step_decision(step)
-      answer = ask_decision("Continue with step [#{step.description}]?")
+    def single_step_decision(step, run_strategy)
+      answer = ask_decision("Continue with step [#{step.description}]?", run_strategy: run_strategy)
       if answer == :yes
         step
       else
@@ -73,12 +76,12 @@ module ForemanMaintain
       end
     end
 
-    def multiple_steps_decision(steps)
+    def multiple_steps_decision(steps, run_strategy)
       puts 'There are multiple steps to proceed:'
       steps.each_with_index do |step, index|
         puts "#{index + 1}) #{step.description}"
       end
-      ask_to_select('Select step to continue', steps, &:description)
+      ask_to_select('Select step to continue', steps, run_strategy)
     end
 
     def filter_decision(answer)
@@ -90,13 +93,15 @@ module ForemanMaintain
     end
 
     # rubocop:disable Metrics/MethodLength
-    def ask_to_select(message, steps)
+    def ask_to_select(message, steps, run_strategy)
       if assumeyes?
         puts('(assuming first option)')
         return steps.first
       end
       until_valid_decision do
-        answer = ask("#{message}, [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]
         else

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -67,6 +67,7 @@ module ForemanMaintain
         end
       end
 
+      attr_accessor :select_option_counter
       attr_reader :last_line, :max_length
 
       def initialize(stdout = STDOUT, stdin = STDIN, options = {})
@@ -81,6 +82,7 @@ module ForemanMaintain
         @spinner = Spinner.new(self)
         @spinner.start_spinner if @stdout.tty?
         @last_line = ''
+        @select_option_counter = 0
       end
 
       def before_scenario_starts(scenario)
@@ -167,8 +169,9 @@ module ForemanMaintain
         @assumeyes
       end
 
-      def single_step_decision(step)
-        answer = ask_decision("Continue with step [#{step.runtime_message}]?")
+      def single_step_decision(step, run_strategy)
+        answer = ask_decision("Continue with step [#{step.runtime_message}]?",
+                              run_strategy: run_strategy)
         if answer == :yes
           step
         else
@@ -176,25 +179,28 @@ module ForemanMaintain
         end
       end
 
-      def multiple_steps_decision(steps)
+      def multiple_steps_decision(steps, run_strategy)
         puts 'There are multiple steps to proceed:'
         steps.each_with_index do |step, index|
           puts "#{index + 1}) #{step.runtime_message}"
         end
-        ask_to_select('Select step to continue', steps, &:runtime_message)
+        ask_to_select('Select step to continue', steps, run_strategy)
       end
 
-      def ask_decision(message, options = 'y(yes), n(no), q(quit)', ignore_assumeyes: false)
+      # rubocop:disable Metrics/LineLength
+      def ask_decision(message, actions_msg: 'y(yes), n(no), q(quit)', ignore_assumeyes: false, run_strategy: :fail_fast)
+        actions_msg = 'y(yes), n(no)' if run_strategy == :fail_slow
         if !ignore_assumeyes && assumeyes?
           print("#{message} (assuming yes)\n")
           return :yes
         end
         until_valid_decision do
-          filter_decision(ask("#{message}, [#{options}]"))
+          filter_decision(ask("#{message}, [#{actions_msg}]"))
         end
       ensure
         clear_line
       end
+      # rubocop:enable Metrics/LineLength
 
       def filter_decision(answer)
         decision = nil
@@ -206,13 +212,17 @@ module ForemanMaintain
       end
 
       # rubocop:disable Metrics/MethodLength
-      def ask_to_select(message, steps)
+      def ask_to_select(message, steps, run_strategy)
         if assumeyes?
-          puts('(assuming first option)')
-          return steps.first
+          step = steps[@select_option_counter]
+          @select_option_counter += 1
+          puts("(assuming option #{@select_option_counter})")
+          return step
         end
+
         until_valid_decision do
-          answer = ask("#{message}, [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]
           else
@@ -277,6 +287,7 @@ module ForemanMaintain
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def scenario_failure_message(scenario)
         return if scenario.passed? && !scenario.warning?
+
         message = []
         message << <<-MESSAGE.strip_heredoc
           Scenario [#{scenario.description}] failed.
@@ -293,13 +304,15 @@ module ForemanMaintain
         end
 
         steps_with_error = scenario.steps_with_error(:whitelisted => false)
+        steps_with_skipped = scenario.steps_with_skipped(:whitelisted => true)
+        steps_to_whitelist = steps_with_error + steps_with_skipped
         unless steps_with_error.empty?
           message << format(<<-MESSAGE.strip_heredoc, format_steps(steps_with_error, "\n", 2))
           The following steps ended up in failing state:
 
           %s
           MESSAGE
-          whitelist_labels = steps_with_error.map(&:label_dashed).join(',')
+          whitelist_labels = steps_to_whitelist.map(&:label_dashed).join(',')
           recommend << format(<<-MESSAGE.strip_heredoc, whitelist_labels)
           Resolve the failed steps and rerun
           the command. In case the failures are false positives,

data/lib/foreman_maintain/runner.rb

@@ -18,6 +18,7 @@ module ForemanMaintain
       @last_scenario = nil
       @last_scenario_continuation_confirmed = false
       @exit_code = 0
+      @procedure_step_counter = 0
     end
 
     def quit?
@@ -70,7 +71,8 @@ module ForemanMaintain
                    :quit
                  elsif @last_scenario.steps_with_warning(:whitelisted => false).any?
                    @last_scenario_continuation_confirmed = true
-                   reporter.ask_decision("Continue with [#{scenario.description}]")
+                   reporter.ask_decision("Continue with [#{scenario.description}]",
+                                         run_strategy: scenario.run_strategy)
                  end
 
       ask_to_quit if [:quit, :no].include?(decision)
@@ -131,7 +133,7 @@ module ForemanMaintain
       if execution.aborted?
         ask_to_quit
       else
-        next_steps_decision = ask_about_offered_steps(step)
+        next_steps_decision = ask_about_offered_steps(step, scenario)
         if next_steps_decision != :yes &&
            execution.fail? && !execution.whitelisted? &&
            scenario.run_strategy == :fail_fast
@@ -141,15 +143,18 @@ module ForemanMaintain
     end
 
     # rubocop:disable  Metrics/MethodLength
-    def ask_about_offered_steps(step)
-      if assumeyes? && rerun_check?(step)
-        @reporter.puts 'Check still failing after attempt to fix. Skipping'
-        return :no
-      end
+    def ask_about_offered_steps(step, scenario)
       if step.next_steps && !step.next_steps.empty?
         @last_decision_step = step
+        @procedure_step_counter += 1
         steps = step.next_steps.map(&:ensure_instance)
-        decision = @reporter.on_next_steps(steps)
+        if assumeyes? && @procedure_step_counter > steps.length
+          @procedure_step_counter = 0
+          @reporter.select_option_counter = 0
+          @reporter.puts 'Check still failing after attempt to fix. Skipping'
+          return :no
+        end
+        decision = @reporter.on_next_steps(steps, scenario.run_strategy)
         case decision
         when :quit
           ask_to_quit

data/lib/foreman_maintain/scenario.rb

@@ -116,6 +116,10 @@ module ForemanMaintain
       filter_whitelisted(executed_steps.find_all(&:warning?), options)
     end
 
+    def steps_with_skipped(options = {})
+      filter_whitelisted(executed_steps.find_all(&:skipped?), options)
+    end
+
     def filter_whitelisted(steps, options)
       options.validate_options!(:whitelisted)
       if options.key?(:whitelisted)

data/lib/foreman_maintain/utils/backup.rb

@@ -163,7 +163,7 @@ module ForemanMaintain
       def validate_hostname?
         # make sure that the system hostname is the same as the backup
         config_tarball = file_map[:config_files][:path]
-        tar_cmd = "tar zxf #{config_tarball} etc/httpd/conf/httpd.conf --to-stdout"
+        tar_cmd = "tar zxf #{config_tarball} etc/httpd/conf/httpd.conf --to-stdout --occurrence=1"
         status, httpd_config = execute_with_status(tar_cmd)
 
         # Incremental backups sometimes don't include httpd.conf. Since a "base" backup

data/lib/foreman_maintain/utils/disk/io_device.rb

@@ -22,6 +22,10 @@ module ForemanMaintain
           convert_kb_to_mb(execute!("df #{dir}|awk {'print $4'}|tail -1").to_i)
         end
 
+        def space_used_in_percent
+          execute!("df #{dir}|awk {'print $5'}|tail -1").to_i
+        end
+
         private
 
         # In fio command, --direct option bypass the cache page

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

@@ -51,19 +51,29 @@ module ForemanMaintain::Utils
 
       def exist?
         if @sys.systemd_installed?
-          systemd = @sys.execute("systemctl is-enabled #{@name} 2>&1 | tail -1").strip
+          systemd = service_enabled_status
           systemd == 'enabled' || systemd == 'disabled'
         else
           File.exist?("/etc/init.d/#{@name}")
         end
       end
 
+      def enabled?
+        if @sys.systemd_installed?
+          service_enabled_status == 'enabled'
+        end
+      end
+
       private
 
       def execute(action, options = {})
         @sys.execute_with_status(command(action, options))
       end
 
+      def service_enabled_status
+        @sys.execute("systemctl is-enabled #{@name} 2>&1 | tail -1").strip
+      end
+
       def skip_enablement_message(action, name)
         # Enable and disable does not work well with globs since they treat them literally.
         # We are skipping the pulpcore-workers@* for these actions until they are configured in

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.6.15'.freeze
+  VERSION = '0.7.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.7.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -125,6 +125,7 @@ files:
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
+- definitions/checks/disk/available_space_candlepin.rb
 - definitions/checks/disk/performance.rb
 - definitions/checks/env_proxy.rb
 - definitions/checks/foreman/check_checkpoint_segments.rb
@@ -147,6 +148,7 @@ files:
 - definitions/checks/mongo/db_up.rb
 - definitions/checks/mongo/tools_installed.rb
 - definitions/checks/original_assets.rb
+- definitions/checks/package_manager/yum/validate_yum_config.rb
 - definitions/checks/pulpcore/db_up.rb
 - definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
@@ -161,7 +163,6 @@ files:
 - definitions/checks/services_up.rb
 - definitions/checks/system_registration.rb
 - definitions/checks/version_locking_enabled.rb
-- definitions/checks/yum_exclude.rb
 - definitions/features/apache.rb
 - definitions/features/candlepin.rb
 - definitions/features/candlepin_database.rb
@@ -170,6 +171,7 @@ files:
 - definitions/features/dynflow_sidekiq.rb
 - definitions/features/foreman_1_11_x.rb
 - definitions/features/foreman_1_7_x.rb
+- definitions/features/foreman_cockpit.rb
 - definitions/features/foreman_database.rb
 - definitions/features/foreman_openscap.rb
 - definitions/features/foreman_proxy.rb
@@ -220,7 +222,9 @@ files:
 - definitions/procedures/backup/snapshot/mount_pulpcore_db.rb
 - definitions/procedures/backup/snapshot/prepare_mount.rb
 - definitions/procedures/candlepin/delete_orphaned_records_from_env_content.rb
+- definitions/procedures/content/migration_stats.rb
 - definitions/procedures/content/prepare.rb
+- definitions/procedures/content/prepare_abort.rb
 - definitions/procedures/content/switchover.rb
 - definitions/procedures/crond/start.rb
 - definitions/procedures/crond/stop.rb
@@ -253,6 +257,7 @@ files:
 - definitions/procedures/packages/update.rb
 - definitions/procedures/packages/update_all_confirmation.rb
 - definitions/procedures/passenger_recycler.rb
+- definitions/procedures/prep_6_10_upgrade.rb
 - definitions/procedures/pulp/migrate.rb
 - definitions/procedures/pulpcore/migrate.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
@@ -288,10 +293,13 @@ files:
 - definitions/scenarios/content.rb
 - definitions/scenarios/maintenance_mode.rb
 - definitions/scenarios/packages.rb
+- definitions/scenarios/prep_6_10_upgrade.rb
 - definitions/scenarios/restore.rb
 - definitions/scenarios/services.rb
 - definitions/scenarios/upgrade_to_capsule_6_8.rb
 - definitions/scenarios/upgrade_to_capsule_6_8_z.rb
+- definitions/scenarios/upgrade_to_capsule_6_9.rb
+- definitions/scenarios/upgrade_to_capsule_6_9_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb
 - definitions/scenarios/upgrade_to_satellite_6_2_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_3.rb
@@ -306,6 +314,8 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_7_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_8.rb
 - definitions/scenarios/upgrade_to_satellite_6_8_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_9.rb
+- definitions/scenarios/upgrade_to_satellite_6_9_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/foreman-protector.conf
 - extras/foreman_protector/foreman-protector.py
@@ -406,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt