voxpupuli-acceptance 2.2.0 → 2.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/voxpupuli/acceptance/spec_helper_acceptance.rb +6 -5
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0de062f2c59ba27c757843a03a6b24005fe26b2a0aba56d06198ae67b1d88588
|
|
4
|
+
data.tar.gz: 8d1e5c99db30e9c6a93ce7705cdebdecc8cf2de10b24abfd0b030c9e6a0b98cf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bd6e0d7dbe34a3ab38e788ccc5fa5a80b450488d59cba1737c7c55479483afec0b59c1d5ce1730f3e83a892962fde759b5e4559853d226793efdbba63ed68f93
|
|
7
|
+
data.tar.gz: ff61ffeb51ae5563d6a74a77cc1bf46ccf80fbbadf226e83e0d908c5a4b8c94d09dfff02d7e5678fd26338754ed34940171ccd8c22e4e1b2ea55ab2c51e0aa46
|
|
@@ -15,10 +15,10 @@ def configure_beaker(modules: :metadata, &block)
|
|
|
15
15
|
|
|
16
16
|
unless ENV['BEAKER_PROVISION'] == 'no'
|
|
17
17
|
block_on hosts, run_in_parallel: true do |host|
|
|
18
|
-
|
|
18
|
+
unless %w[none preinstalled].include?(collection)
|
|
19
19
|
BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, collection)
|
|
20
20
|
end
|
|
21
|
-
package_name = BeakerPuppetHelpers::InstallUtils.puppet_package_name(host, prefer_aio:
|
|
21
|
+
package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.puppet_package_name(host, prefer_aio: collection != 'none'))
|
|
22
22
|
host.install_package(package_name)
|
|
23
23
|
|
|
24
24
|
# by default, puppet-agent creates /etc/profile.d/puppet-agent.sh which adds /opt/puppetlabs/bin to PATH
|
|
@@ -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
|
|
63
|
+
if local_setup_content
|
|
63
64
|
puts "Configuring #{host} by applying #{local_setup}"
|
|
64
|
-
apply_manifest_on(host,
|
|
65
|
+
apply_manifest_on(host, local_setup_content, catch_failures: true)
|
|
65
66
|
end
|
|
66
67
|
end
|
|
67
68
|
end
|
|
@@ -80,7 +81,7 @@ 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
|
+
'fqdn/%{networking.fqdn}.yaml',
|
|
84
85
|
'os/%{os.family}/%{os.release.major}.yaml',
|
|
85
86
|
'os/%{os.family}.yaml',
|
|
86
87
|
'common.yaml',
|
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.
|
|
4
|
+
version: 2.4.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-
|
|
11
|
+
date: 2023-11-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bcrypt_pbkdf
|