beaker-puppet 2.1.0 → 3.0.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.
- checksums.yaml +4 -4
- data/.github/workflows/release.yml +1 -1
- data/.github/workflows/test.yml +2 -2
- data/.github_changelog_generator +3 -0
- data/.rubocop_todo.yml +52 -7
- data/CHANGELOG.md +14 -3
- data/CODEOWNERS +1 -0
- data/README.md +4 -13
- data/acceptance/tests/stub_host.rb +1 -1
- data/beaker-puppet.gemspec +3 -3
- data/lib/beaker-puppet/helpers/puppet_helpers.rb +20 -95
- data/lib/beaker-puppet/install_utils/foss_utils.rb +10 -194
- data/lib/beaker-puppet/install_utils/puppet_utils.rb +0 -17
- data/lib/beaker-puppet/version.rb +1 -1
- data/release-prep.sh +11 -0
- data/setup/aio/010_Install_Puppet_Agent.rb +22 -8
- data/setup/common/040_ValidateSignCert.rb +4 -11
- data/setup/gem/010_GemInstall.rb +1 -1
- data/spec/beaker-puppet/helpers/puppet_helpers_spec.rb +1 -251
- data/spec/beaker-puppet/install_utils/foss_utils_spec.rb +34 -463
- data/spec/beaker-puppet/install_utils/puppet_utils_spec.rb +0 -23
- data/tasks/ci.rake +27 -19
- metadata +11 -6
data/tasks/ci.rake
CHANGED
@@ -299,7 +299,8 @@ end
|
|
299
299
|
def beaker(command, *argv)
|
300
300
|
argv.concat(ENV['OPTIONS'].split(' ')) if ENV['OPTIONS']
|
301
301
|
|
302
|
-
|
302
|
+
bundle_cmd = (ENV.fetch('BUNDLE_GEMFILE', false) && ENV.fetch('BUNDLE_BIN_PATH', false)) ? %w[bundle exec] : []
|
303
|
+
sh(*bundle_cmd, 'beaker', command.to_s, *argv)
|
303
304
|
end
|
304
305
|
|
305
306
|
def beaker_setup(type)
|
@@ -315,10 +316,14 @@ def beaker_suite(type)
|
|
315
316
|
beaker(:provision)
|
316
317
|
|
317
318
|
begin
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
319
|
+
begin
|
320
|
+
beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
|
321
|
+
beaker(:exec, 'pre-suite', '--preserve-state')
|
322
|
+
|
323
|
+
beaker(:exec, ENV.fetch('TESTS', nil))
|
324
|
+
ensure
|
325
|
+
beaker(:exec, 'post-suite')
|
326
|
+
end
|
322
327
|
ensure
|
323
328
|
preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
|
324
329
|
beaker(:destroy) unless preserve_hosts
|
@@ -330,23 +335,26 @@ def beaker_suite_retry(type)
|
|
330
335
|
beaker(:provision)
|
331
336
|
|
332
337
|
begin
|
333
|
-
beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
|
334
|
-
beaker(:exec, 'pre-suite', '--preserve-state')
|
335
|
-
|
336
338
|
begin
|
337
|
-
|
338
|
-
beaker(:exec,
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
339
|
+
beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
|
340
|
+
beaker(:exec, 'pre-suite', '--preserve-state')
|
341
|
+
|
342
|
+
begin
|
343
|
+
json_results_file = Tempfile.new
|
344
|
+
beaker(:exec, ENV.fetch('TESTS', nil), '--test-results-file', json_results_file.path)
|
345
|
+
rescue RuntimeError => e
|
346
|
+
puts "ERROR: #{e.message}"
|
347
|
+
tests_to_rerun = JSON.load(File.read(json_results_file.path))
|
348
|
+
raise e if tests_to_rerun.nil? || tests_to_rerun.empty?
|
349
|
+
|
350
|
+
puts '*** Retrying the following:'
|
351
|
+
puts tests_to_rerun.map { |spec| " #{spec}" }
|
352
|
+
beaker(:exec, tests_to_rerun.map { |str| "#{str}" }.join(','))
|
353
|
+
end
|
354
|
+
ensure
|
355
|
+
beaker(:exec, 'post-suite')
|
347
356
|
end
|
348
357
|
ensure
|
349
|
-
beaker(:exec, 'post-suite')
|
350
358
|
preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
|
351
359
|
beaker(:destroy) unless preserve_hosts
|
352
360
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: beaker-puppet
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
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: 2024-
|
11
|
+
date: 2024-02-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fakefs
|
@@ -78,14 +78,14 @@ dependencies:
|
|
78
78
|
requirements:
|
79
79
|
- - "~>"
|
80
80
|
- !ruby/object:Gem::Version
|
81
|
-
version:
|
81
|
+
version: 2.1.0
|
82
82
|
type: :development
|
83
83
|
prerelease: false
|
84
84
|
version_requirements: !ruby/object:Gem::Requirement
|
85
85
|
requirements:
|
86
86
|
- - "~>"
|
87
87
|
- !ruby/object:Gem::Version
|
88
|
-
version:
|
88
|
+
version: 2.1.0
|
89
89
|
- !ruby/object:Gem::Dependency
|
90
90
|
name: beaker-vmpooler
|
91
91
|
requirement: !ruby/object:Gem::Requirement
|
@@ -106,14 +106,14 @@ dependencies:
|
|
106
106
|
requirements:
|
107
107
|
- - "~>"
|
108
108
|
- !ruby/object:Gem::Version
|
109
|
-
version: '
|
109
|
+
version: '5.0'
|
110
110
|
type: :runtime
|
111
111
|
prerelease: false
|
112
112
|
version_requirements: !ruby/object:Gem::Requirement
|
113
113
|
requirements:
|
114
114
|
- - "~>"
|
115
115
|
- !ruby/object:Gem::Version
|
116
|
-
version: '
|
116
|
+
version: '5.0'
|
117
117
|
- !ruby/object:Gem::Dependency
|
118
118
|
name: oga
|
119
119
|
requirement: !ruby/object:Gem::Requirement
|
@@ -139,6 +139,7 @@ files:
|
|
139
139
|
- ".github/dependabot.yml"
|
140
140
|
- ".github/workflows/release.yml"
|
141
141
|
- ".github/workflows/test.yml"
|
142
|
+
- ".github_changelog_generator"
|
142
143
|
- ".gitignore"
|
143
144
|
- ".rubocop.yml"
|
144
145
|
- ".rubocop_todo.yml"
|
@@ -192,6 +193,7 @@ files:
|
|
192
193
|
- lib/beaker/dsl/install_utils/foss_utils.rb
|
193
194
|
- lib/beaker/dsl/install_utils/module_utils.rb
|
194
195
|
- lib/beaker/dsl/install_utils/puppet_utils.rb
|
196
|
+
- release-prep.sh
|
195
197
|
- setup/aio/010_Install_Puppet_Agent.rb
|
196
198
|
- setup/common/000-delete-puppet-when-none.rb
|
197
199
|
- setup/common/003_solaris_cert_fix.rb
|
@@ -235,6 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
235
237
|
- - ">="
|
236
238
|
- !ruby/object:Gem::Version
|
237
239
|
version: '2.7'
|
240
|
+
- - "<"
|
241
|
+
- !ruby/object:Gem::Version
|
242
|
+
version: '3.2'
|
238
243
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
239
244
|
requirements:
|
240
245
|
- - ">="
|