beaker-puppet 2.1.0 → 3.0.0

data/tasks/ci.rake

@@ -299,7 +299,8 @@ end
 def beaker(command, *argv)
   argv.concat(ENV['OPTIONS'].split(' ')) if ENV['OPTIONS']
 
-  sh('beaker', command.to_s, *argv)
+  bundle_cmd = (ENV.fetch('BUNDLE_GEMFILE', false) && ENV.fetch('BUNDLE_BIN_PATH', false)) ? %w[bundle exec] : []
+  sh(*bundle_cmd, 'beaker', command.to_s, *argv)
 end
 
 def beaker_setup(type)
@@ -315,10 +316,14 @@ def beaker_suite(type)
   beaker(:provision)
 
   begin
-    beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
-    beaker(:exec, 'pre-suite', '--preserve-state')
-    beaker(:exec, ENV.fetch('TESTS', nil))
-    beaker(:exec, 'post-suite')
+    begin
+      beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
+      beaker(:exec, 'pre-suite', '--preserve-state')
+
+      beaker(:exec, ENV.fetch('TESTS', nil))
+    ensure
+      beaker(:exec, 'post-suite')
+    end
   ensure
     preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
     beaker(:destroy) unless preserve_hosts
@@ -330,23 +335,26 @@ def beaker_suite_retry(type)
   beaker(:provision)
 
   begin
-    beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
-    beaker(:exec, 'pre-suite', '--preserve-state')
-
     begin
-      json_results_file = Tempfile.new
-      beaker(:exec, ENV.fetch('TESTS', nil), '--test-results-file', json_results_file.path)
-    rescue RuntimeError => e
-      puts "ERROR: #{e.message}"
-      tests_to_rerun = JSON.load(File.read(json_results_file.path))
-      raise e if tests_to_rerun.nil? || tests_to_rerun.empty?
-
-      puts '*** Retrying the following:'
-      puts tests_to_rerun.map { |spec| "  #{spec}" }
-      beaker(:exec, tests_to_rerun.map { |str| "#{str}" }.join(','))
+      beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
+      beaker(:exec, 'pre-suite', '--preserve-state')
+
+      begin
+        json_results_file = Tempfile.new
+        beaker(:exec, ENV.fetch('TESTS', nil), '--test-results-file', json_results_file.path)
+      rescue RuntimeError => e
+        puts "ERROR: #{e.message}"
+        tests_to_rerun = JSON.load(File.read(json_results_file.path))
+        raise e if tests_to_rerun.nil? || tests_to_rerun.empty?
+
+        puts '*** Retrying the following:'
+        puts tests_to_rerun.map { |spec| "  #{spec}" }
+        beaker(:exec, tests_to_rerun.map { |str| "#{str}" }.join(','))
+      end
+    ensure
+      beaker(:exec, 'post-suite')
     end
   ensure
-    beaker(:exec, 'post-suite')
     preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
     beaker(:destroy) unless preserve_hosts
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: beaker-vmpooler
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
+- ".github_changelog_generator"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -192,6 +193,7 @@ files:
 - lib/beaker/dsl/install_utils/foss_utils.rb
 - lib/beaker/dsl/install_utils/module_utils.rb
 - lib/beaker/dsl/install_utils/puppet_utils.rb
+- release-prep.sh
 - setup/aio/010_Install_Puppet_Agent.rb
 - setup/common/000-delete-puppet-when-none.rb
 - setup/common/003_solaris_cert_fix.rb
@@ -235,6 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="