foreman_maintain 1.7.4 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd7c83e3e9aa5d629b7c65334c4022e8923979a432a917570733afd4d9fef41
-  data.tar.gz: bc2306bdcac1cb11c91f9105902bdac47cf9ad4ddd02a0774d25b035da4a67f5
+  metadata.gz: 22d0abf16f40a1448c08bbcc3841e1347d27ffe2e7da598e05dd27a3c565de49
+  data.tar.gz: b3b19431311ac39014e8679653bcb61c055cf46f4cc867158cc1222485986ebd
 SHA512:
-  metadata.gz: 8ae072acb083a756c5e4e3eb6b9c87f6f79ebfaa1a70e0385cc0f150078476c63d88c91b443d2b5d9ccb8a0f6c1ec3685f5c26600a147c7ed2f756c0530c6e72
-  data.tar.gz: 76edef0a64cabe97dfb4f515dcc20be20f562418d0e6dbe5b58b27f52bde5821791afe152342c17170ed32d4e377072b35288b5a8c77266b1ff39fe5eaac7044
+  metadata.gz: 6534adf54060798589ef949490e03d43ef58525b6cf6818a0b55c9f1c909bd29b6cd8db3909e0961efaf3357b6148ef868b75713c15bd1b85ab7729c7b2331c9
+  data.tar.gz: 53173b1621d5ced84e12eeffb80a03fb5d808dd92ed2f29585439506312e382600cfc25a53c799a692344513de27fe313c5bda1717b17304ef27068909627664

data/README.md

@@ -20,7 +20,6 @@ Subcommands:
       check --target-version TARGET_VERSION   Run pre-upgrade checks for upgrading to specified version
             --disable-self-upgrade            Disable automatic self upgrade (default: false)
       run --target-version TARGET_VERSION     Run the full upgrade
-          [--phase=phase TARGET_VERSION]      Run just a specific phase of the upgrade
           --disable-self-upgrade              Disable automatic self upgrade (default: false)
 
     advanced                      Advanced tools for server maintenance

data/definitions/features/pulpcore.rb

@@ -68,8 +68,8 @@ class Features::Pulpcore < ForemanMaintain::Feature
 
   def self.pulpcore_common_services
     [
-      ForemanMaintain::Utils.system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
-      ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content'),
+      ForemanMaintain::Utils.system_service('pulpcore-api', 20, :socket => 'pulpcore-api'),
+      ForemanMaintain::Utils.system_service('pulpcore-content', 20, :socket => 'pulpcore-content'),
     ]
   end
 end

data/lib/foreman_maintain/update_runner.rb

@@ -36,7 +36,11 @@ module ForemanMaintain
       PHASES.each do |phase|
         return run_rollback if quit?
 
-        run_phase(phase)
+        if skip?(phase)
+          skip_phase(phase)
+        else
+          run_phase(phase)
+        end
       end
 
       finish_update unless quit?
@@ -90,12 +94,22 @@ module ForemanMaintain
       @ask_to_confirm_update = phase == :pre_update_checks
     end
 
+    def skip_phase(skipped_phase)
+      with_non_empty_scenario(skipped_phase) do |scenario|
+        @reporter.before_scenario_starts(scenario)
+        @reporter.puts <<~MESSAGE
+          Skipping #{skipped_phase} phase as it was already run before.
+        MESSAGE
+        @reporter.after_scenario_finishes(scenario)
+      end
+    end
+
     private
 
     def rollback_pre_migrations
       raise "Unexpected phase #{phase}, expecting pre_migrations" unless phase == :pre_migrations
 
-      rollback_needed = scenario(:pre_migrations).steps.any? { |s| s.executed? && s.success? }
+      rollback_needed = find_scenario(:pre_migrations).steps.any? { |s| s.executed? && s.success? }
       if rollback_needed
         @quit = false
         # prevent the unnecessary confirmation questions
@@ -110,7 +124,7 @@ module ForemanMaintain
     end
 
     def with_non_empty_scenario(phase)
-      next_scenario = scenario(phase)
+      next_scenario = find_scenario(phase)
       unless next_scenario.nil? || next_scenario.steps.empty?
         yield next_scenario
       end
@@ -153,6 +167,11 @@ module ForemanMaintain
       @ask_to_confirm_update = false
     end
 
+    def skip?(next_phase)
+      # the next_phase was run before the current phase
+      PHASES.index(next_phase) < PHASES.index(phase)
+    end
+
     def phase=(phase)
       raise "Unknown phase #{phase}" unless PHASES.include?(phase)
 

data/lib/foreman_maintain/upgrade_runner.rb

@@ -137,7 +137,6 @@ module ForemanMaintain
         @reporter.before_scenario_starts(scenario)
         @reporter.puts <<~MESSAGE
           Skipping #{skipped_phase} phase as it was already run before.
-          To enforce to run the phase, use `upgrade run --phase #{skipped_phase}`
         MESSAGE
         @reporter.after_scenario_finishes(scenario)
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.4'.freeze
+  VERSION = '1.7.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.6
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -410,7 +410,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -429,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []