foreman_maintain 0.8.26 → 0.8.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07e94dcd8b177dfd099dba0073afd0f231cbe2fd4a1029b6576d587c5cb94f3a
-  data.tar.gz: ca3855c666713a17cc2fdb5d995fdfc15237e083a98978964cfd276b44d55e18
+  metadata.gz: 3ab72c4918a40ef7bfa20d26aaec96b2bd5fb1361aa6bf1fcd7e690e5d77f7c1
+  data.tar.gz: 1ffafe8717734bf82ac1a99862b95da731c31a756974c5cf0ba9da54aa5c1d71
 SHA512:
-  metadata.gz: 360bc155ca767b7ffd7c1ca17a8e9e669c4b2eb91ddc4148134c4f475af57888ee0938976d07dfaee48b2fa3ead2d8c6e2ab83c060330b42645fcaf9397697ae
-  data.tar.gz: 4b6df3189ca5ee87b6051995729a74e9641ac6866fa7bf6330285f5b59f5d29e92a25a332e718967125deddb9525d4ff119ff727b31f4e40ec55b7cf26db2805
+  metadata.gz: 0b9707e8c9a64d2c0bb41072dcc5f7ba9abea59cbd105db9a24fd30e1198431d3d0b6d9593b3c773ec58fa235c8758eb48fded45c4bf627359cc15495a976866
+  data.tar.gz: '0928589a6fd6a13c23c98c7e21c3e057becf650e11fe473df94480bd7fdcec92cf0724e56288d6e4afa022bdbccc0a971448648afd500b52f56e6da46df3e808'

data/definitions/procedures/content/prepare.rb

@@ -4,6 +4,7 @@ module Procedures::Content
       description 'Prepare content for Pulp 3'
       for_feature :pulpcore
       param :quiet, 'Keep the output on a single line', :flag => true, :default => false
+      do_not_whitelist
     end
 
     def run

data/definitions/procedures/content/switchover.rb

@@ -9,6 +9,7 @@ module Procedures::Content
       end
 
       param :skip_deb, 'Do not run debian options in installer.'
+      do_not_whitelist
     end
 
     def run

data/definitions/procedures/installer/upgrade_rake_task.rb

@@ -5,7 +5,9 @@ module Procedures::Installer
     end
 
     def run
-      execute!('foreman-rake upgrade:run')
+      # only run this in the Satellite scenario, as in others
+      # the installer runs this rake task for us already
+      execute!('foreman-rake upgrade:run') if feature(:satellite)
     end
   end
 end

data/definitions/scenarios/restore.rb

@@ -42,6 +42,8 @@ module ForemanMaintain::Scenarios
       add_steps_with_context(Procedures::Restore::RegenerateQueues) if backup.online_backup?
       add_steps_with_context(Procedures::Service::Start,
                              Procedures::Service::DaemonReload)
+      add_step(Procedures::Installer::Upgrade.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::UpgradeRakeTask)
       add_step_with_context(Procedures::Crond::Start) if feature(:cron)
     end
     # rubocop:enable Metrics/MethodLength,Metrics/AbcSize

data/definitions/scenarios/self_upgrade.rb

@@ -13,15 +13,22 @@ module ForemanMaintain::Scenarios
     end
 
     def target_version
-      @target_version ||= context.get(:target_version)
+      current_full_version = feature(:instance).downstream.current_version
+      @target_version ||= current_full_version.bump
     end
 
     def current_version
       feature(:instance).downstream.current_minor_version
     end
 
+    def maintenance_repo_label
+      @maintenance_repo_label ||= context.get(:maintenance_repo_label)
+    end
+
     def maintenance_repo_id(version)
-      if (repo = ENV['maintenance_repo'])
+      if maintenance_repo_label
+        return maintenance_repo_label
+      elsif (repo = ENV['MAINTENANCE_REPO_LABEL'])
         return repo unless repo.empty?
       end
 

data/lib/foreman_maintain/cli/self_upgrade_command.rb

@@ -1,38 +1,23 @@
 module ForemanMaintain
   module Cli
     class SelfUpgradeCommand < Base
-      option ['--target-version'], 'TARGET_VERSION',\
-             'Major version of the Satellite or Capsule'\
-           	', e.g 7.0', :required => true
+      option ['--maintenance-repo-label'], 'REPOSITORY_LABEL',\
+             'Repository label from which packages should be updated.'\
+             'This can be used when standard CDN repositories are unavailable.'
       def execute
-        allow_major_version_upgrade_only
         run_scenario(upgrade_scenario, upgrade_rescue_scenario)
       end
 
       def upgrade_scenario
-        Scenarios::SelfUpgrade.new(target_version: target_version)
+        Scenarios::SelfUpgrade.new(
+          maintenance_repo_label: maintenance_repo_label
+        )
       end
 
       def upgrade_rescue_scenario
-        Scenarios::SelfUpgradeRescue.new(target_version: target_version)
-      end
-
-      def current_downstream_version
-        ForemanMaintain.detector.feature(:instance).downstream.current_version
-      end
-
-      def allow_major_version_upgrade_only
-        begin
-          next_version = Gem::Version.new(target_version)
-        rescue ArgumentError => err
-          raise Error::UsageError, "Invalid version! #{err}"
-        end
-        if current_downstream_version >= next_version
-          message = "The target-version #{target_version} should be "\
-                    "greater than existing version #{current_downstream_version},"\
-                    "\nand self-upgrade should be used for major version upgrades only!"
-          raise Error::UsageError, message
-        end
+        Scenarios::SelfUpgradeRescue.new(
+          maintenance_repo_label: maintenance_repo_label
+        )
       end
     end
   end

data/lib/foreman_maintain/concerns/metadata.rb

@@ -100,6 +100,10 @@ module ForemanMaintain
           @data[:advanced_run] = advanced_run
         end
 
+        def do_not_whitelist
+          @data[:do_not_whitelist] = true
+        end
+
         def self.eval_dsl(metadata, &block)
           new(metadata).tap do |dsl|
             dsl.instance_eval(&block)

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -317,7 +317,11 @@ module ForemanMaintain
 
         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
+        not_skippable_steps = scenario.steps_with_error.select do |step|
+          step.metadata[:do_not_whitelist] == true
+        end
+
+        steps_to_whitelist = steps_with_error + steps_with_skipped - not_skippable_steps
         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:
@@ -325,11 +329,25 @@ module ForemanMaintain
           %s
           MESSAGE
           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,
-          use --whitelist="%s"
-          MESSAGE
+          unless whitelist_labels.empty?
+            recommend << if scenario.detector.feature(:instance).downstream
+                           format(<<-MESSAGE.strip_heredoc, whitelist_labels)
+              Resolve the failed steps and rerun the command.
+
+              If the situation persists and, you are unclear what to do next,
+              contact Red Hat Technical Support.
+
+              In case the failures are false positives, use
+              --whitelist="%s"
+              MESSAGE
+                         else
+                           format(<<-MESSAGE.strip_heredoc, whitelist_labels)
+              Resolve the failed steps and rerun the command.
+              In case the failures are false positives, use
+              --whitelist="%s"
+              MESSAGE
+                         end
+          end
         end
 
         steps_with_warning = scenario.steps_with_warning(:whitelisted => false)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.26'.freeze
+  VERSION = '0.8.29'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.26
+  version: 0.8.29
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp