beaker 4.33.0 → 4.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 616dad30c0a52596729122a76480319c8de41481e0db2eda6a8928d749753ebc
-  data.tar.gz: b2576fdfc69863c773cf6f1bf4680abdf37ff9dcec1d1181197b63a5ddcbb480
+  metadata.gz: 156fe839f18012ce2b3dcdc385123d328158e21f33e36b6e11debc5a67f51cee
+  data.tar.gz: 0dac80928255da4606d5f5710ffb3f569c93afa20d52039318150acafb883ed5
 SHA512:
-  metadata.gz: 4275553bc11bdf88c2d61362ef90b7ae4ebbf4d9edefa7dd425047749b15c71c66d793c9f1cdc6177aa1f8ccbddeb7753415cc20095ca561825c1731cf4130e8
-  data.tar.gz: 3c84ade543f27139069dd163634a0bd531a22f8c9c397450f32d102d609ebd2023e1c89dea7074a00da05d5bd8f95965c5f1895c69d845942ef7b4bcc2ca81a2
+  metadata.gz: '005694a4e2e756da6b1221833476bb0789398b0a78e9923ec0bb16a0081b21fbb1a33a8a7f56811da58f3225a0fb4f3e26f2a00dac91745197e20cefa64fde12'
+  data.tar.gz: 443607f9a33182feef6360a6af2d1956457a581a15156e5c9c2498a132427971332a19ffaf9b18218af9f9f9031c2420a7a2b9a8713b42ceecab50d0a5e44fff

data/.github/workflows/test.yml

@@ -19,6 +19,7 @@ jobs:
           - ruby: "2.6"
           - ruby: "2.7"
           - ruby: "3.0"
+          - ruby: "3.1"
             coverage: "yes"
     env:
       COVERAGE: ${{ matrix.coverage }}
@@ -29,5 +30,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+      - name: Build gem
+        run: gem build *.gemspec
       - name: Run tests
         run: bundle exec rake spec

data/CHANGELOG.md

@@ -1,10 +1,36 @@
 # Changelog
 
+## [4.36.0](https://github.com/voxpupuli/beaker/tree/4.36.0) (2022-05-30)
+
+## Added
+
+- (PE-33493) Add Ubuntu 2204 codename ([#1740](https://github.com/voxpupuli/beaker/pull/1740))
+
+
+## [4.35.0](https://github.com/voxpupuli/beaker/tree/4.35.0) (2022-05-13)
+
+## Added
+
+- Add Ruby 3.1 support ([#1736](https://github.com/voxpupuli/beaker/pull/1736))
+- Build gem during CI runs ([#1738](https://github.com/voxpupuli/beaker/pull/1738))
+
+## [4.34.0](https://github.com/voxpupuli/beaker/tree/4.34.0) (2022-01-27)
+
+### Added
+
+- Extract a host_packages method from validate_host ([#1729](https://github.com/voxpupuli/beaker/pull/1729))
+- Reduce duplication in ssh_permit_user_environment ([#1728](https://github.com/voxpupuli/beaker/pull/1728))
+
+### Fixed
+
+- Do not install curl on EL9 ([#1728](https://github.com/voxpupuli/beaker/pull/1732))
+- Drop old Ruby 1.8 compatibility code ([#1728](https://github.com/voxpupuli/beaker/pull/1730))
+
 ## [4.33.0](https://github.com/voxpupuli/beaker/tree/4.33.0) (2022-01-21)
 
 ### Added
 
-- Add ed25519 ad runtime dependency  ([#1726](https://github.com/voxpupuli/beaker/pull/1726))
+- Add ed25519 as runtime dependency ([#1726](https://github.com/voxpupuli/beaker/pull/1726))
 
 ## [4.32.0](https://github.com/voxpupuli/beaker/tree/4.32.0) (2021-12-06)
 

data/Gemfile

@@ -28,3 +28,5 @@ group :coverage, optional: ENV['COVERAGE']!='yes' do
   gem 'simplecov-console', :require => false
   gem 'codecov', :require => false
 end
+
+gem 'rdoc' if RUBY_VERSION >= '3.1'

data/lib/beaker/host/unix/exec.rb

@@ -302,29 +302,11 @@ module Unix::Exec
   #   (from {#ssh_service_restart}).
   def ssh_permit_user_environment
     case self['platform']
-    when /debian|ubuntu|cumulus|huaweios|archlinux/
+    when /debian|ubuntu|cumulus|huaweios|archlinux|el-|centos|fedora|redhat|oracle|scientific|eos|opensuse|sles|solaris/
       directory = tmpdir()
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
       exec(Beaker::Command.new("echo '' >/etc/environment")) if self['platform'] =~ /ubuntu-20.04/
-    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|el-8|centos-8|redhat-8|oracle-8/
-      directory = tmpdir()
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
-      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-    when /el-|centos|fedora|redhat|oracle|scientific|eos/
-      directory = tmpdir()
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
-      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-    when /opensuse|sles/
-      directory = tmpdir()
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
-      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-    when /solaris/
-      # kept solaris here because refactoring it into its own Host module
-      # conflicts with the solaris hypervisor that already exists
-      directory = tmpdir()
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
-      exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
     else

data/lib/beaker/host_prebuilt_steps.rb

@@ -13,6 +13,7 @@ module Beaker
     SLEEPWAIT = 5
     TRIES = 5
     RHEL8_PACKAGES = ['curl', 'chrony']
+    RHEL9_PACKAGES = ['chrony']
     FEDORA_PACKAGES = ['curl', 'chrony']
     UNIX_PACKAGES = ['curl', 'ntpdate']
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
@@ -101,42 +102,58 @@ module Beaker
     def validate_host host, opts
       logger = opts[:logger]
       block_on host do |host|
-        case
-        when host['platform'] =~ /el-[89]/
-          check_and_install_packages_if_needed(host, RHEL8_PACKAGES)
-        when host['platform'] =~ /sles-10/
-          check_and_install_packages_if_needed(host, SLES10_PACKAGES)
-        when host['platform'] =~ /opensuse|sles-/
-          check_and_install_packages_if_needed(host, SLES_PACKAGES)
-        when host['platform'] =~ /debian/
-          check_and_install_packages_if_needed(host, DEBIAN_PACKAGES)
-        when host['platform'] =~ /cumulus/
-          check_and_install_packages_if_needed(host, CUMULUS_PACKAGES)
-        when (host['platform'] =~ /windows/ and host.is_cygwin?)
-          raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
-          check_and_install_packages_if_needed(host, WINDOWS_PACKAGES)
-        when (host['platform'] =~ /windows/ and not host.is_cygwin?)
-          check_and_install_packages_if_needed(host, PSWINDOWS_PACKAGES)
-        when host['platform'] =~ /freebsd/
-          check_and_install_packages_if_needed(host, FREEBSD_PACKAGES)
-        when host['platform'] =~ /openbsd/
-          check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
-        when host['platform'] =~ /solaris-10/
-          check_and_install_packages_if_needed(host, SOLARIS10_PACKAGES)
-        when host['platform'] =~ /solaris-1[1-9]/
-          check_and_install_packages_if_needed(host, SOLARIS11_PACKAGES)
-        when host['platform'] =~ /archlinux/
-          check_and_install_packages_if_needed(host, ARCHLINUX_PACKAGES)
-        when host['platform'] =~ /fedora/
-          check_and_install_packages_if_needed(host, FEDORA_PACKAGES)
-        when host['platform'] !~ /debian|aix|solaris|windows|opensuse-|sles-|osx-|cumulus|f5-|netscaler|cisco_/
-          check_and_install_packages_if_needed(host, UNIX_PACKAGES)
-        end
+        check_and_install_packages_if_needed(host, host_packages(host))
       end
     rescue => e
       report_and_raise(logger, e, "validate")
     end
 
+    # Return a list of packages that should be present.
+    #
+    # @param [Host] host A host return the packages for
+    # @return [Array<String>] A list of packages to install
+    def host_packages(host)
+      case host['platform']
+      when /el-8/
+        RHEL8_PACKAGES
+      when /el-9/
+        RHEL9_PACKAGES
+      when /sles-10/
+        SLES10_PACKAGES
+      when /opensuse|sles-/
+        SLES_PACKAGES
+      when /debian/
+        DEBIAN_PACKAGES
+      when /cumulus/
+        CUMULUS_PACKAGES
+      when /windows/
+        if host.is_cygwin?
+          raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
+          WINDOWS_PACKAGES
+        else
+          PSWINDOWS_PACKAGES
+        end
+      when /freebsd/
+        FREEBSD_PACKAGES
+      when /openbsd/
+        OPENBSD_PACKAGES
+      when /solaris-10/
+        SOLARIS10_PACKAGES
+      when /solaris-1[1-9]/
+        SOLARIS11_PACKAGES
+      when /archlinux/
+        ARCHLINUX_PACKAGES
+      when /fedora/
+        FEDORA_PACKAGES
+      else
+        if host['platform'] !~ /aix|solaris|osx-|f5-|netscaler|cisco_/
+          UNIX_PACKAGES
+        else
+          []
+        end
+      end
+    end
+
     # Installs the given packages if they aren't already on a host
     #
     # @param [Host] host Host to act on

data/lib/beaker/options/hosts_file_parser.rb

@@ -2,6 +2,7 @@ module Beaker
   module Options
     #A set of functions to parse hosts files
     module HostsFileParser
+      PERMITTED_YAML_CLASSES = [Beaker::Options::OptionsHash, Beaker::Platform, Symbol, Time]
 
       # Read the contents of the hosts.cfg into an OptionsHash, merge the 'CONFIG' section into the OptionsHash, return OptionsHash
       # @param [String] hosts_file_path The path to the hosts file
@@ -24,7 +25,7 @@ module Beaker
 
           raise "#{hosts_file_path} is not a valid path" unless File.exist?(hosts_file_path)
 
-          YAML.load(ERB.new(File.read(hosts_file_path), nil, '-').result(binding))
+          process_yaml(File.read(hosts_file_path), binding)
         }
         fix_roles_array( host_options )
       end
@@ -42,7 +43,7 @@ module Beaker
         return host_options unless hosts_def_yaml
         error_message = "#{hosts_def_yaml}\nis not a valid YAML string\n\t"
         host_options = self.merge_hosts_yaml( host_options, error_message ) {
-          YAML.load(ERB.new(hosts_def_yaml, nil, '-').result(binding))
+          process_yaml(hosts_def_yaml, binding)
         }
         fix_roles_array( host_options )
       end
@@ -85,6 +86,23 @@ module Beaker
         host_options.merge( loaded_host_options )
       end
 
+      # A helper to parse the YAML file and apply ERB templating
+      #
+      # @param [String] path Path to the file to read
+      # @param [Binding] b The binding to pass to ERB rendering
+      # @api private
+      def self.process_yaml(template, b)
+        erb_obj = if RUBY_VERSION >= '2.7'
+                     ERB.new(template, trim_mode: '-')
+                   else
+                     ERB.new(template, nil, '-')
+                   end
+        if RUBY_VERSION >= '2.6'
+          YAML.safe_load(erb_obj.result(b), permitted_classes: PERMITTED_YAML_CLASSES)
+        else
+          YAML.load(erb_obj.result(b))
+        end
+      end
     end
   end
 end

data/lib/beaker/platform.rb

@@ -13,7 +13,8 @@ module Beaker
                      "wheezy"    => "7",
                      "squeeze"   => "6",
                    },
-        :ubuntu => { "focal"   => "2004",
+        :ubuntu => { "jammy"   => "2204",
+                     "focal"   => "2004",
                      "eoan"    => "1910",
                      "disco"   => "1904",
                      "cosmic"  => "1810",
@@ -130,14 +131,5 @@ module Beaker
     def with_version_number
       [@variant, @version, @arch].join('-')
     end
-
-    if RUBY_VERSION =~ /^1\.9/
-      def init_with(coder)
-        coder.map.each do |ivar, value|
-          instance_variable_set("@#{ivar}", value)
-        end
-        replace("#{@variant}-#{@version}-#{@arch}")
-      end
-    end
   end
 end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.33.0'
+    STRING = '4.36.0'
   end
 end

data/spec/beaker/cli_spec.rb

@@ -1,5 +1,15 @@
 require 'spec_helper'
 
+def load_yaml_file(path)
+  # Ruby 2.x has no safe_load_file
+  if YAML.respond_to?(:safe_load_file)
+    permitted = [Beaker::Options::OptionsHash, Symbol, RSpec::Mocks::Double, Time]
+    YAML.safe_load_file(path, permitted_classes: permitted, aliases: true)
+  else
+    YAML.load_file(path)
+  end
+end
+
 module Beaker
   describe CLI do
 
@@ -361,7 +371,7 @@ module Beaker
           cli.instance_variable_set(:@hosts, hosts)
 
           preserved_file = cli.preserve_hosts_file
-          hosts_yaml = YAML.load_file(preserved_file)
+          hosts_yaml = load_yaml_file(preserved_file)
           expect(hosts_yaml['CONFIG'][:tests]).to be == []
           expect(hosts_yaml['CONFIG'][:pre_suite]).to be == []
           expect(hosts_yaml['CONFIG'][:post_suite]).to be == []
@@ -428,7 +438,7 @@ module Beaker
             cli.execute!
 
             copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
-            expect{ YAML.load_file(copied_hosts_file) }.to_not raise_error
+            expect{ load_yaml_file(copied_hosts_file) }.to_not raise_error
           end
         end
 
@@ -440,7 +450,7 @@ module Beaker
             cli.execute!
 
             copied_hosts_file = File.join(File.absolute_path(dir), 'hosts_preserved.yml')
-            yaml_content = YAML.load_file(copied_hosts_file)
+            yaml_content = load_yaml_file(copied_hosts_file)
             expect( yaml_content['CONFIG']['provision'] ).to be_falsy
           end
         end

data/spec/beaker/host/unix/pkg_spec.rb

@@ -106,7 +106,7 @@ module Beaker
         pkg = 'sles_package'
         expect( Beaker::Command ).to receive( :new ).with( /^rpmkeys.*nightlies.puppetlabs.com.*/, anything, anything ).and_return('').ordered.once
         expect( Beaker::Command ).to receive(:new).with("zypper --gpg-auto-import-keys se -i --match-exact #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('').ordered.once
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0})).exactly(2).times
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0})).exactly(2).times
         expect( instance.check_for_package(pkg) ).to be === true
       end
       it "checks correctly on opensuse" do
@@ -114,7 +114,7 @@ module Beaker
         pkg = 'sles_package'
         expect( Beaker::Command ).to receive( :new ).with( /^rpmkeys.*nightlies.puppetlabs.com.*/, anything, anything ).and_return('').ordered.once
         expect( Beaker::Command ).to receive(:new).with("zypper --gpg-auto-import-keys se -i --match-exact #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('').ordered.once
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0})).exactly(2).times
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0})).exactly(2).times
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -122,7 +122,7 @@ module Beaker
         @opts = {'platform' => 'fedora-is-me'}
         pkg = 'fedora_package'
         expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -131,7 +131,7 @@ module Beaker
           @opts = {'platform' => "#{platform}-is-me"}
           pkg = "#{platform}_package"
           expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-          expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+          expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
           expect( instance.check_for_package(pkg) ).to be === true
         end
       end
@@ -140,7 +140,7 @@ module Beaker
         @opts = {'platform' => 'eos-is-me'}
         pkg = 'eos-package'
         expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -148,7 +148,7 @@ module Beaker
         @opts = {'platform' => 'el-is-me'}
         pkg = 'el_package'
         expect( Beaker::Command ).to receive(:new).with("rpm -q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -156,14 +156,14 @@ module Beaker
         @opts = {'platform' => 'huaweios-is-me'}
         pkg = 'debian_package'
         expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
       it "checks correctly on debian" do
         @opts = {'platform' => 'debian-is-me'}
         pkg = 'debian_package'
         expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -171,7 +171,7 @@ module Beaker
         @opts = {'platform' => 'ubuntu-is-me'}
         pkg = 'ubuntu_package'
         expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -179,7 +179,7 @@ module Beaker
         @opts = {'platform' => 'cumulus-is-me'}
         pkg = 'cumulus_package'
         expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -187,7 +187,7 @@ module Beaker
         @opts = {'platform' => 'solaris-11-is-me'}
         pkg = 'solaris-11_package'
         expect( Beaker::Command ).to receive(:new).with("pkg info #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -195,7 +195,7 @@ module Beaker
         @opts = {'platform' => 'solaris-10-is-me'}
         pkg = 'solaris-10_package'
         expect( Beaker::Command ).to receive(:new).with("pkginfo #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
@@ -203,7 +203,7 @@ module Beaker
         @opts = {'platform' => 'archlinux-is-me'}
         pkg = 'archlinux_package'
         expect( Beaker::Command ).to receive(:new).with("pacman -Q #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.check_for_package(pkg) ).to be === true
       end
 

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -489,9 +489,9 @@ describe Beaker do
     end
 
     it 'skips validation on cisco hosts' do
-      @platform = 'cisco_nexus-7-x86_64'
-      expect( subject ).to receive( :check_and_install_packages_if_needed ).never
-      subject.validate_host(hosts, options)
+      host = make_host('cisco-7', { stdout: stdout, platform: 'cisco_nexus-7-x86_64' })
+      expect( subject ).to receive( :check_and_install_packages_if_needed ).with(host, []).once
+      subject.validate_host(host, options)
     end
   end
 

data/spec/beaker/logger_spec.rb

@@ -17,12 +17,7 @@ module Beaker
         expect( logger.convert(valid_utf8) ).to be === valid_utf8
       end
       it 'strips out invalid utf-8 characters' do
-        #this is 1.9 behavior only
-        if RUBY_VERSION.to_f >= 1.9
-          expect( logger.convert(invalid_utf8) ).to be === valid_utf8
-        else
-          pending "not supported in ruby 1.8 (using #{RUBY_VERSION})"
-        end
+        expect( logger.convert(invalid_utf8) ).to be === valid_utf8
       end
       it 'supports frozen strings' do
         valid_utf8.freeze

data/spec/beaker/options/hosts_file_parser_spec.rb

@@ -66,9 +66,10 @@ module Beaker
           expect( host_options ).to be === parser.new_host_options
         end
 
-        it 'passes a YAML.load call through to #merge_hosts_yaml' do
+        it 'passes a process_yaml call through to #merge_hosts_yaml' do
           yaml_string = 'not actually yaml, but that wont matter'
-          expect( YAML ).to receive( :load ).with( yaml_string )
+          expect(described_class).to receive(:process_yaml).with(yaml_string, instance_of(Binding))
+
           parser.parse_hosts_string( yaml_string )
         end
       end

data/spec/beaker/platform_spec.rb

@@ -82,12 +82,17 @@ module Beaker
         expect( platform.with_version_codename ).to be === 'debian-squeeze-xxx'
       end
 
-      it "can convert unbuntu-2004-xxx to ubuntu-focal-xxx" do
+      it "can convert ubuntu-2204-xxx to ubuntu-jammy-xxx" do
+        @name = 'ubuntu-2204-xxx'
+	expect( platform.with_version_codename ).to be === 'ubuntu-jammy-xxx'
+      end
+
+      it "can convert ubuntu-2004-xxx to ubuntu-focal-xxx" do
         @name = 'ubuntu-2004-xxx'
         expect( platform.with_version_codename ).to be === 'ubuntu-focal-xxx'
       end
 
-      it "can convert unbuntu-1604-xxx to ubuntu-xenial-xxx" do
+      it "can convert ubuntu-1604-xxx to ubuntu-xenial-xxx" do
         @name = 'ubuntu-1604-xxx'
         expect( platform.with_version_codename ).to be === 'ubuntu-xenial-xxx'
 
@@ -145,12 +150,19 @@ module Beaker
       end
     end
 
-    context 'round tripping from yaml', if: RUBY_VERSION =~ /^1\.9/ do
+    context 'round tripping from yaml' do
       before do
         @name = 'ubuntu-14.04-x86_64'
       end
 
-      let(:round_tripped) { YAML.load(YAML.dump(platform)) }
+      let(:round_tripped) do
+        # Ruby 2 has no unsafe_load
+        if YAML.respond_to?(:unsafe_load)
+          YAML.unsafe_load(YAML.dump(platform))
+        else
+          YAML.load(YAML.dump(platform))
+        end
+      end
 
       [:variant, :arch, :version, :codename].each do |field|
         it "deserializes the '#{field}' field" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.33.0
+  version: 4.36.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -676,7 +676,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!