voxpupuli-acceptance 3.5.0 → 3.5.1

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.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/voxpupuli/acceptance/spec_helper_acceptance.rb +9 -6
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b94004396716a88abf812b4b9eb36e8ec6cf29ef9faaf7b3abcc5494c164aec5
4
- data.tar.gz: fbb13171a4eade95e39fabc99609d6ee286269b713834d6f161928fd38525055
3
+ metadata.gz: 5018a9cf35e912764ea35a0dfdfd950a7927ebeb3846bd5363ed65c73c78c10f
4
+ data.tar.gz: 38342bf8567097f375baf3c6a924aff5ffacb3d404a4ccd35825690634970d36
5
5
  SHA512:
6
- metadata.gz: fb81c5a2090cede4108248a8958b5d1d4d03b9eb5941914c98d0a7f109e708a07a0a584bd2a8e0abc92b36a820d54702d4543f3b776cb7b7cd91ba37bb5cd45e
7
- data.tar.gz: 515e5307d2ad807862a07a5f7d0c97f4628c74cf524ea7fa2ffe1ed1309079cd4ddedfbfcff3052c36409bad5b8cf9496dc81471f4942e06c0d9ea4e363480a6
6
+ metadata.gz: 94a7b6f7a744bf33855ab164e17364fdb47a5c19b778ce850c7fcef32871d91eaa488d3db094ab3c8b6f9e181ffe5b1f88640914b1014dc7e93c2c52865427c3
7
+ data.tar.gz: 7307a924d50f0f4a4ac63b159b28a689707c8c79eee94bbdb130260a5436efcdb3601438415bdc9b3c9d766f67c5ac414727091929570412843d7a151929b3e8
data/lib/voxpupuli/acceptance/spec_helper_acceptance.rb CHANGED
@@ -18,13 +18,16 @@ def configure_beaker(modules: :metadata, &block)
18
18
 
19
19
  unless ENV['BEAKER_PROVISION'] == 'no'
20
20
  block_on hosts, run_in_parallel: true do |host|
21
- unless %w[none preinstalled].include?(collection)
22
- BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, collection)
23
- end
24
- package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME') do
25
- BeakerPuppetHelpers::InstallUtils.collection2packagename(host, collection, prefer_aio: collection != 'none')
21
+ if collection != 'preinstalled'
22
+ if collection != 'none'
23
+ BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, collection)
24
+ end
25
+
26
+ package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME') do
27
+ BeakerPuppetHelpers::InstallUtils.collection2packagename(host, collection)
28
+ end
29
+ host.install_package(package_name)
26
30
  end
27
- host.install_package(package_name)
28
31
 
29
32
  # by default, puppet-agent creates /etc/profile.d/puppet-agent.sh which adds /opt/puppetlabs/bin to PATH
30
33
  # in our non-interactive ssh sessions we manipulate PATH in ~/.ssh/environment, we need to do this step here as well
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: voxpupuli-acceptance
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.0
4
+ version: 3.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vox Pupuli
@@ -85,14 +85,14 @@ dependencies:
85
85
  requirements:
86
86
  - - "~>"
87
87
  - !ruby/object:Gem::Version
88
- version: '2.1'
88
+ version: '2.2'
89
89
  type: :runtime
90
90
  prerelease: false
91
91
  version_requirements: !ruby/object:Gem::Requirement
92
92
  requirements:
93
93
  - - "~>"
94
94
  - !ruby/object:Gem::Version
95
- version: '2.1'
95
+ version: '2.2'
96
96
  - !ruby/object:Gem::Dependency
97
97
  name: beaker-rspec
98
98
  requirement: !ruby/object:Gem::Requirement