voxpupuli-acceptance 1.2.1 → 2.1.0

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 (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/voxpupuli/acceptance/fixtures.rb +1 -1
  3. data/lib/voxpupuli/acceptance/spec_helper_acceptance.rb +16 -15
  4. metadata +71 -63
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e977b81783186f2458b645bfcd8a8a880f3fd892ac81e0e3b3216f4a761787c7
4
- data.tar.gz: edb61a0207a567134bdcd0c9286981256d58e2b71f154e06f66f26ee9d62616f
3
+ metadata.gz: c6866e9d634d4af76ba1ca0f0f66a5c500b233922d7e4bf9778fc8b6c8ffb64c
4
+ data.tar.gz: 8177647c83516dbe5e22f16ca62dd16d7f633e05e67836ec37ad27fc3259d922
5
5
  SHA512:
6
- metadata.gz: 2b91f6f7c92200cc392e385a3a5a70b88c8123bf003c3d5bf047f82c166028ca413c70d95c57ec6a8fbdef06dbe170225ace4dcadaabb1971a61f0e45bc80d10
7
- data.tar.gz: 2c94555594ce7f673976de9a802ce85b7935a539b161b57e1b9eef6d9ff8731dc717010a6fc3eca6ad49bc79dbb029df5a0520f0a8db40ad67f5e15d254cdfc5
6
+ metadata.gz: 9822328d43646e2a43b7dfff7c73665c08631797049aebde52b90d84bfa118bbeabbbfde23353519841d04edcaa28c34e8b4942fdb98b5b9e2f08e88270e5bcd
7
+ data.tar.gz: c2358fa82e380f9be4d4a2297dc021ea30764e7bc2c989fc53ba1bda6873d6731bae284e7fd183aaa8a39752baed9fe7d29cb10356d44b33570617e2989f51b3
data/lib/voxpupuli/acceptance/fixtures.rb CHANGED
@@ -85,7 +85,7 @@ module Voxpupuli
85
85
  logger.debug("Copying module #{name} from #{source_path} to #{target_file}") if logger
86
86
 
87
87
  scp_to(host, source_path, target_file)
88
- on host, puppet("module install --force --ignore-dependencies '#{target_file}'")
88
+ on host, "puppet module install --force --ignore-dependencies '#{target_file}'"
89
89
  end
90
90
  end
91
91
  end
data/lib/voxpupuli/acceptance/spec_helper_acceptance.rb CHANGED
@@ -1,27 +1,29 @@
1
1
  require_relative 'examples'
2
2
 
3
3
  def configure_beaker(modules: :metadata, &block)
4
- ENV['PUPPET_INSTALL_TYPE'] ||= 'agent'
5
- ENV['BEAKER_PUPPET_COLLECTION'] ||= 'puppet6'
4
+ collection = ENV['BEAKER_PUPPET_COLLECTION'] || 'puppet'
6
5
  ENV['BEAKER_debug'] ||= 'true'
7
6
  ENV['BEAKER_HYPERVISOR'] ||= 'docker'
8
7
 
9
8
  # On Ruby 3 this doesn't appear to matter but on Ruby 2 beaker-hiera must be
10
9
  # included before beaker-rspec so Beaker::DSL is final
11
10
  require 'beaker-hiera'
11
+ require 'beaker_puppet_helpers'
12
12
  require 'beaker-rspec'
13
- require 'beaker-puppet'
14
- require 'beaker/puppet_install_helper'
15
-
16
- case modules
17
- when :metadata
18
- require 'beaker/module_install_helper'
19
- $module_source_dir = get_module_source_directory caller
20
- when :fixtures
21
- require_relative 'fixtures'
22
- end
23
13
 
24
- run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
14
+ require_relative 'fixtures' if modules == :fixtures
15
+
16
+ unless ENV['BEAKER_provision'] == 'no'
17
+ block_on hosts, run_in_parallel: true do |host|
18
+ BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, collection) unless collection == 'none'
19
+ package_name = BeakerPuppetHelpers::InstallUtils.puppet_package_name(host)
20
+ host.install_package(package_name)
21
+
22
+ # by default, puppet-agent creates /etc/profile.d/puppet-agent.sh which adds /opt/puppetlabs/bin to PATH
23
+ # in our non-interactive ssh sessions we manipulate PATH in ~/.ssh/environment, we need to do this step here as well
24
+ host.add_env_var('PATH', '/opt/puppetlabs/bin')
25
+ end
26
+ end
25
27
 
26
28
  RSpec.configure do |c|
27
29
  # Readable test descriptions
@@ -31,8 +33,7 @@ def configure_beaker(modules: :metadata, &block)
31
33
  c.before :suite do
32
34
  case modules
33
35
  when :metadata
34
- install_module
35
- install_module_dependencies
36
+ install_local_module_on(hosts)
36
37
  when :fixtures
37
38
  fixture_modules = File.join(Dir.pwd, 'spec', 'fixtures', 'modules')
38
39
  Voxpupuli::Acceptance::Fixtures.install_fixture_modules_on(hosts, fixture_modules)
metadata CHANGED
@@ -1,57 +1,63 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: voxpupuli-acceptance
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 2.1.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-03-28 00:00:00.000000000 Z
11
+ date: 2023-07-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt_pbkdf
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: '1.1'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '0'
26
+ version: '1.1'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: beaker
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '4.33'
34
+ - - "<"
35
+ - !ruby/object:Gem::Version
36
+ version: '6'
34
37
  type: :runtime
35
38
  prerelease: false
36
39
  version_requirements: !ruby/object:Gem::Requirement
37
40
  requirements:
38
- - - "~>"
41
+ - - ">="
39
42
  - !ruby/object:Gem::Version
40
43
  version: '4.33'
44
+ - - "<"
45
+ - !ruby/object:Gem::Version
46
+ version: '6'
41
47
  - !ruby/object:Gem::Dependency
42
48
  name: beaker-docker
43
49
  requirement: !ruby/object:Gem::Requirement
44
50
  requirements:
45
- - - ">="
51
+ - - "~>"
46
52
  - !ruby/object:Gem::Version
47
- version: '0'
53
+ version: '2.1'
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
51
57
  requirements:
52
- - - ">="
58
+ - - "~>"
53
59
  - !ruby/object:Gem::Version
54
- version: '0'
60
+ version: '2.1'
55
61
  - !ruby/object:Gem::Dependency
56
62
  name: beaker-hiera
57
63
  requirement: !ruby/object:Gem::Requirement
@@ -70,114 +76,98 @@ dependencies:
70
76
  name: beaker-hostgenerator
71
77
  requirement: !ruby/object:Gem::Requirement
72
78
  requirements:
73
- - - ">="
79
+ - - "~>"
74
80
  - !ruby/object:Gem::Version
75
- version: 1.1.22
81
+ version: '2.2'
76
82
  type: :runtime
77
83
  prerelease: false
78
84
  version_requirements: !ruby/object:Gem::Requirement
79
85
  requirements:
80
- - - ">="
86
+ - - "~>"
81
87
  - !ruby/object:Gem::Version
82
- version: 1.1.22
88
+ version: '2.2'
83
89
  - !ruby/object:Gem::Dependency
84
- name: beaker-module_install_helper
90
+ name: beaker_puppet_helpers
85
91
  requirement: !ruby/object:Gem::Requirement
86
92
  requirements:
87
- - - ">="
93
+ - - "~>"
88
94
  - !ruby/object:Gem::Version
89
- version: '0'
95
+ version: '1.0'
90
96
  type: :runtime
91
97
  prerelease: false
92
98
  version_requirements: !ruby/object:Gem::Requirement
93
99
  requirements:
94
- - - ">="
100
+ - - "~>"
95
101
  - !ruby/object:Gem::Version
96
- version: '0'
102
+ version: '1.0'
97
103
  - !ruby/object:Gem::Dependency
98
- name: beaker-puppet
104
+ name: beaker-rspec
99
105
  requirement: !ruby/object:Gem::Requirement
100
106
  requirements:
101
- - - ">="
102
- - !ruby/object:Gem::Version
103
- version: '0'
104
- type: :runtime
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - ">="
107
+ - - "~>"
109
108
  - !ruby/object:Gem::Version
110
- version: '0'
111
- - !ruby/object:Gem::Dependency
112
- name: beaker-puppet_install_helper
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
109
+ version: '8.0'
115
110
  - - ">="
116
111
  - !ruby/object:Gem::Version
117
- version: '0'
112
+ version: 8.0.1
118
113
  type: :runtime
119
114
  prerelease: false
120
115
  version_requirements: !ruby/object:Gem::Requirement
121
116
  requirements:
122
- - - ">="
123
- - !ruby/object:Gem::Version
124
- version: '0'
125
- - !ruby/object:Gem::Dependency
126
- name: beaker-rspec
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - ">="
117
+ - - "~>"
130
118
  - !ruby/object:Gem::Version
131
- version: '0'
132
- type: :runtime
133
- prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
119
+ version: '8.0'
136
120
  - - ">="
137
121
  - !ruby/object:Gem::Version
138
- version: '0'
122
+ version: 8.0.1
139
123
  - !ruby/object:Gem::Dependency
140
124
  name: beaker-vagrant
141
125
  requirement: !ruby/object:Gem::Requirement
142
126
  requirements:
143
- - - ">="
127
+ - - "~>"
144
128
  - !ruby/object:Gem::Version
145
- version: '0'
129
+ version: '1.2'
146
130
  type: :runtime
147
131
  prerelease: false
148
132
  version_requirements: !ruby/object:Gem::Requirement
149
133
  requirements:
150
- - - ">="
134
+ - - "~>"
151
135
  - !ruby/object:Gem::Version
152
- version: '0'
136
+ version: '1.2'
153
137
  - !ruby/object:Gem::Dependency
154
138
  name: puppet-modulebuilder
155
139
  requirement: !ruby/object:Gem::Requirement
156
140
  requirements:
157
141
  - - "~>"
158
142
  - !ruby/object:Gem::Version
159
- version: '0.1'
143
+ version: '1.0'
160
144
  type: :runtime
161
145
  prerelease: false
162
146
  version_requirements: !ruby/object:Gem::Requirement
163
147
  requirements:
164
148
  - - "~>"
165
149
  - !ruby/object:Gem::Version
166
- version: '0.1'
150
+ version: '1.0'
167
151
  - !ruby/object:Gem::Dependency
168
152
  name: rake
169
153
  requirement: !ruby/object:Gem::Requirement
170
154
  requirements:
155
+ - - "~>"
156
+ - !ruby/object:Gem::Version
157
+ version: '13.0'
171
158
  - - ">="
172
159
  - !ruby/object:Gem::Version
173
- version: '0'
160
+ version: 13.0.6
174
161
  type: :runtime
175
162
  prerelease: false
176
163
  version_requirements: !ruby/object:Gem::Requirement
177
164
  requirements:
165
+ - - "~>"
166
+ - !ruby/object:Gem::Version
167
+ version: '13.0'
178
168
  - - ">="
179
169
  - !ruby/object:Gem::Version
180
- version: '0'
170
+ version: 13.0.6
181
171
  - !ruby/object:Gem::Dependency
182
172
  name: rspec-github
183
173
  requirement: !ruby/object:Gem::Requirement
@@ -196,30 +186,42 @@ dependencies:
196
186
  name: serverspec
197
187
  requirement: !ruby/object:Gem::Requirement
198
188
  requirements:
189
+ - - "~>"
190
+ - !ruby/object:Gem::Version
191
+ version: '2.42'
199
192
  - - ">="
200
193
  - !ruby/object:Gem::Version
201
- version: '0'
194
+ version: 2.42.2
202
195
  type: :runtime
203
196
  prerelease: false
204
197
  version_requirements: !ruby/object:Gem::Requirement
205
198
  requirements:
199
+ - - "~>"
200
+ - !ruby/object:Gem::Version
201
+ version: '2.42'
206
202
  - - ">="
207
203
  - !ruby/object:Gem::Version
208
- version: '0'
204
+ version: 2.42.2
209
205
  - !ruby/object:Gem::Dependency
210
206
  name: winrm
211
207
  requirement: !ruby/object:Gem::Requirement
212
208
  requirements:
209
+ - - "~>"
210
+ - !ruby/object:Gem::Version
211
+ version: '2.3'
213
212
  - - ">="
214
213
  - !ruby/object:Gem::Version
215
- version: '0'
214
+ version: 2.3.6
216
215
  type: :runtime
217
216
  prerelease: false
218
217
  version_requirements: !ruby/object:Gem::Requirement
219
218
  requirements:
219
+ - - "~>"
220
+ - !ruby/object:Gem::Version
221
+ version: '2.3'
220
222
  - - ">="
221
223
  - !ruby/object:Gem::Version
222
- version: '0'
224
+ version: 2.3.6
223
225
  - !ruby/object:Gem::Dependency
224
226
  name: puppetlabs_spec_helper
225
227
  requirement: !ruby/object:Gem::Requirement
@@ -227,6 +229,9 @@ dependencies:
227
229
  - - ">="
228
230
  - !ruby/object:Gem::Version
229
231
  version: 4.0.0
232
+ - - "<"
233
+ - !ruby/object:Gem::Version
234
+ version: '7'
230
235
  type: :development
231
236
  prerelease: false
232
237
  version_requirements: !ruby/object:Gem::Requirement
@@ -234,6 +239,9 @@ dependencies:
234
239
  - - ">="
235
240
  - !ruby/object:Gem::Version
236
241
  version: 4.0.0
242
+ - - "<"
243
+ - !ruby/object:Gem::Version
244
+ version: '7'
237
245
  description: A package that depends on all the gems Vox Pupuli modules need and methods
238
246
  to simplify acceptance spec helpers
239
247
  email:
@@ -260,7 +268,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
260
268
  requirements:
261
269
  - - ">="
262
270
  - !ruby/object:Gem::Version
263
- version: '2.4'
271
+ version: '2.7'
264
272
  - - "<"
265
273
  - !ruby/object:Gem::Version
266
274
  version: '4'