foreman_maintain 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87bde0596489f26881bb8ee92b9cec10df4aead0e72fb3411a6dc80916949efe
-  data.tar.gz: 0da057d0f9f7b6aaa0e5a2e0484a7adb66ed41eb09f0ef9f7fa32949640d7f92
+  metadata.gz: c02c6edfe990d37bd485aa0cb9831bab961b03e002314d1c860c676fb21916c2
+  data.tar.gz: 8762d61ebb0ef9d842f4dc32ffaf7344c909bd4c686486f0ffe7a30e8a4ae7a4
 SHA512:
-  metadata.gz: 76b77f3b03a65565e8cc4264ce27b9e172bfc1f84c2f9819718e359551f7906c42783e1cd2f50f3a5ad4601445274c92e8fa734c90141da993f7a6777c39d4a6
-  data.tar.gz: 9b1dd4c293088f06b87584857123e74e17f2b7802408a0086d1889b159ef69a904af0b7eb16bc8f9f5a84bca7281d44fa30c4c9c4726853a854ea42f8f81365a
+  metadata.gz: 2dac90b49cb5e868c3cbcaef102a7b7a472ea141ab228fbbfdb7b1fbc1687509f8842b984b5b90992a42dc2afdc4d07c48aa2b699ed912c1fb7232b49d3d00a8
+  data.tar.gz: 183cc48e2535b8f569954bdc96e5328c0ef8ed595458244091912cbecf757a86507759b3470c2a8fb3ea0fab442bed79e62fc4bdb94f909191d1824c454a82d1

data/definitions/features/dynflow_sidekiq.rb

@@ -37,6 +37,6 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
   end
 
   def configured_instances
-    Dir['/etc/foreman/dynflow/*'].map { |config| File.basename(config, '.yml') }
+    Dir['/etc/foreman/dynflow/*.yml'].map { |config| File.basename(config, '.yml') }
   end
 end

data/lib/foreman_maintain/runner.rb

@@ -15,6 +15,7 @@ module ForemanMaintain
       @reporter = reporter
       @scenarios = Array(scenarios)
       @quit = false
+      @rescue = false
       @last_scenario = nil
       @last_scenario_continuation_confirmed = false
       @exit_code = 0
@@ -29,12 +30,17 @@ module ForemanMaintain
       @assumeyes
     end
 
+    def rescue?
+      @rescue
+    end
+
     def run
       @scenarios.each do |scenario|
         run_scenario(scenario)
         next unless @quit
 
         if @rescue_scenario
+          @rescue = true
           logger.debug('=== Rescue scenario found. Executing ===')
           execute_scenario_steps(@rescue_scenario, true)
         end
@@ -44,10 +50,10 @@ module ForemanMaintain
 
     def run_scenario(scenario)
       return if scenario.steps.empty?
-      raise 'The runner is already in quit state' if quit?
+      raise 'The runner is already in quit state' if quit? && !rescue?
 
       confirm_scenario(scenario)
-      return if quit?
+      return if quit? && !rescue?
 
       execute_scenario_steps(scenario)
     ensure

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.7.9'.freeze
+  VERSION = '0.7.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp