voxpupuli-acceptance 2.3.0 → 3.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a2c35bcd82a31ef76e426ba44392b798467a4daf852a8e21940c30adfa1ee976
4
- data.tar.gz: e94e870258088116e11d0e5c155fdec57c4034e34d429568ddd9e1608a7ac8a4
3
+ metadata.gz: '098c17ba13c06d2f1716cd5075533ae969eac0e7e8ea86b0a993271543eb8054'
4
+ data.tar.gz: a06cb7423827952137954414cff62c2568889e50eb2d11c10d94d6211312a245
5
5
  SHA512:
6
- metadata.gz: b39026527782daf48daecee2a118f29f4ebbc3a065e8d29f3ffe3225fdf51ca05fd44596aa4d588861a6e32a75f1b253e9af3ab4db941195272d66670a29e4be
7
- data.tar.gz: 177c1b5ae6452a0e76e4daa3d99ec9ef16472595897ec6c60f760bb8e811788849a0e2d668eff312c8c6e879313f3eb5a3fae32a0e5e3375035fbfb9b2dd6dde
6
+ metadata.gz: ea35f677944d934e5286601f42a07f302b595ae0e652ea8b5c2f53f4fcc9f9a8ec7a9042daf11eb0ec42d98261e1ec62a1011101bbe426c7a21e9a1546fb09d1
7
+ data.tar.gz: 353f3bcf7df5ae31c24ecc5cb297039fe0a3eb7204ec54ee3f0352efdbea71c75eb930d6c34a096afadebf9cbba5b0d01564e23f9e109fed18a8e1e964a60259
@@ -56,12 +56,13 @@ def configure_beaker(modules: :metadata, &block)
56
56
  end
57
57
 
58
58
  local_setup = RSpec.configuration.setup_acceptance_node
59
+ local_setup_content = File.exist?(local_setup) ? File.read(local_setup) : nil
59
60
  hosts.each do |host|
60
61
  yield host if block
61
62
 
62
- if local_setup && File.exist?(local_setup)
63
+ if local_setup_content
63
64
  puts "Configuring #{host} by applying #{local_setup}"
64
- apply_manifest_on(host, File.read(local_setup), catch_failures: true)
65
+ apply_manifest_on(host, local_setup_content, catch_failures: true)
65
66
  end
66
67
  end
67
68
  end
@@ -80,10 +81,22 @@ RSpec.configure do |c|
80
81
  c.add_setting :suite_hiera, default: true
81
82
  c.add_setting :suite_hiera_data_dir, default: File.join('spec', 'acceptance', 'hieradata')
82
83
  c.add_setting :suite_hiera_hierachy, default: [
83
- 'fqdn/%{fqdn}.yaml',
84
- 'os/%{os.family}/%{os.release.major}.yaml',
85
- 'os/%{os.family}.yaml',
86
- 'common.yaml',
84
+ {
85
+ name: "Per-node data",
86
+ path: 'fqdn/%{facts.networking.fqdn}.yaml',
87
+ },
88
+ {
89
+ name: 'OS family version data',
90
+ path: 'family/%{facts.os.family}/%{facts.os.release.major}.yaml',
91
+ },
92
+ {
93
+ name: 'OS family data',
94
+ path: 'family/%{facts.os.family}.yaml',
95
+ },
96
+ {
97
+ name: 'Common data',
98
+ path: 'common.yaml',
99
+ },
87
100
  ]
88
101
 
89
102
  # Node setup
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: voxpupuli-acceptance
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 3.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vox Pupuli
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-10-24 00:00:00.000000000 Z
11
+ date: 2023-11-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt_pbkdf
@@ -64,14 +64,14 @@ dependencies:
64
64
  requirements:
65
65
  - - "~>"
66
66
  - !ruby/object:Gem::Version
67
- version: '0.4'
67
+ version: '1.0'
68
68
  type: :runtime
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - "~>"
73
73
  - !ruby/object:Gem::Version
74
- version: '0.4'
74
+ version: '1.0'
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: beaker-hostgenerator
77
77
  requirement: !ruby/object:Gem::Requirement