foreman_maintain 1.7.3 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e15401e01712537566856184b187a132a0c3db2634955d8688875ba4c2ca01
-  data.tar.gz: 5e0bcafc241cf70f128ebe6fe887b50b83dd265311fec601360f92bbd2760751
+  metadata.gz: cd1a7ccb0a384dfbcbde42660854837199df64a4bcf465a3ea92fb77809eff3a
+  data.tar.gz: 54f3cbec98e27261489708521a4cb43a41411cb0c40699a5a04c09c6ec66edb3
 SHA512:
-  metadata.gz: c6344eb03b0caec004ebd5920bd7d416535000379361146680af2e1870d28a98816403210bcc8db78dc18be27c2d8559400fbc0c7160f5e8c680923f833b4eb6
-  data.tar.gz: cd87120311bedea2789b1ccf9db5b16ae8b81282eb0d49ac9e053f19b4702328dca9a502e4788898fd47330122dca3014dabf579f02a8e885c24685c72fd619c
+  metadata.gz: a60449b267d0b2e5cf90358b87f0ebebf3987b782fae40fcedcc88472790e4ecca1c2a4d4bf3d92497fb328e56fa792b3b8e8fa5ac05c50866f3f3662b4f31c0
+  data.tar.gz: 3fb5c40f6edac2b69cb455af6c90c9c43a4ec91a0d2e8dca590edf2339931c08c58f239565a601280f9b81a4d5ab4c742ad91740bd96e0a26bab633aaa04cc16

data/definitions/features/pulpcore.rb

@@ -21,11 +21,13 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def cli(args)
-    parse_json(execute("pulp --format json #{args}"))
+    parse_json(execute!("pulp --format json #{args}"))
   end
 
   def running_tasks
     cli('task list --state-in running --state-in canceling')
+  rescue ForemanMaintain::Error::ExecutionError
+    []
   end
 
   def wait_for_tasks(spinner, timeout_for_tasks_status = TIMEOUT_FOR_TASKS_STATUS)

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/utils/service/abstract.rb

@@ -55,6 +55,10 @@ module ForemanMaintain::Utils
         raise NotImplementedError
       end
 
+      def restart
+        raise NotImplementedError
+      end
+
       def enable
         raise NotImplementedError
       end

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

@@ -38,6 +38,14 @@ module ForemanMaintain::Utils
         [0, db_status.last]
       end
 
+      def restart
+        command_name = ForemanMaintain.command_name
+        db_status(<<~MSG
+          Remote databases are not managed by #{command_name} and therefore was not restarted.
+        MSG
+                 )
+      end
+
       def running?
         status.first == 0
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.3'.freeze
+  VERSION = '1.7.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-29 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp