foreman_maintain 0.7.9 → 0.7.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 87bde0596489f26881bb8ee92b9cec10df4aead0e72fb3411a6dc80916949efe
4
- data.tar.gz: 0da057d0f9f7b6aaa0e5a2e0484a7adb66ed41eb09f0ef9f7fa32949640d7f92
3
+ metadata.gz: c02c6edfe990d37bd485aa0cb9831bab961b03e002314d1c860c676fb21916c2
4
+ data.tar.gz: 8762d61ebb0ef9d842f4dc32ffaf7344c909bd4c686486f0ffe7a30e8a4ae7a4
5
5
  SHA512:
6
- metadata.gz: 76b77f3b03a65565e8cc4264ce27b9e172bfc1f84c2f9819718e359551f7906c42783e1cd2f50f3a5ad4601445274c92e8fa734c90141da993f7a6777c39d4a6
7
- data.tar.gz: 9b1dd4c293088f06b87584857123e74e17f2b7802408a0086d1889b159ef69a904af0b7eb16bc8f9f5a84bca7281d44fa30c4c9c4726853a854ea42f8f81365a
6
+ metadata.gz: 2dac90b49cb5e868c3cbcaef102a7b7a472ea141ab228fbbfdb7b1fbc1687509f8842b984b5b90992a42dc2afdc4d07c48aa2b699ed912c1fb7232b49d3d00a8
7
+ data.tar.gz: 183cc48e2535b8f569954bdc96e5328c0ef8ed595458244091912cbecf757a86507759b3470c2a8fb3ea0fab442bed79e62fc4bdb94f909191d1824c454a82d1
@@ -37,6 +37,6 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
37
37
  end
38
38
 
39
39
  def configured_instances
40
- Dir['/etc/foreman/dynflow/*'].map { |config| File.basename(config, '.yml') }
40
+ Dir['/etc/foreman/dynflow/*.yml'].map { |config| File.basename(config, '.yml') }
41
41
  end
42
42
  end
@@ -15,6 +15,7 @@ module ForemanMaintain
15
15
  @reporter = reporter
16
16
  @scenarios = Array(scenarios)
17
17
  @quit = false
18
+ @rescue = false
18
19
  @last_scenario = nil
19
20
  @last_scenario_continuation_confirmed = false
20
21
  @exit_code = 0
@@ -29,12 +30,17 @@ module ForemanMaintain
29
30
  @assumeyes
30
31
  end
31
32
 
33
+ def rescue?
34
+ @rescue
35
+ end
36
+
32
37
  def run
33
38
  @scenarios.each do |scenario|
34
39
  run_scenario(scenario)
35
40
  next unless @quit
36
41
 
37
42
  if @rescue_scenario
43
+ @rescue = true
38
44
  logger.debug('=== Rescue scenario found. Executing ===')
39
45
  execute_scenario_steps(@rescue_scenario, true)
40
46
  end
@@ -44,10 +50,10 @@ module ForemanMaintain
44
50
 
45
51
  def run_scenario(scenario)
46
52
  return if scenario.steps.empty?
47
- raise 'The runner is already in quit state' if quit?
53
+ raise 'The runner is already in quit state' if quit? && !rescue?
48
54
 
49
55
  confirm_scenario(scenario)
50
- return if quit?
56
+ return if quit? && !rescue?
51
57
 
52
58
  execute_scenario_steps(scenario)
53
59
  ensure
@@ -1,3 +1,3 @@
1
1
  module ForemanMaintain
2
- VERSION = '0.7.9'.freeze
2
+ VERSION = '0.7.10'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_maintain
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.9
4
+ version: 0.7.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-03-25 00:00:00.000000000 Z
11
+ date: 2021-06-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: clamp