beaker 4.40.1 → 4.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 772b30c85d3406390ceba9e0df29f7911dc990a579da87e3d520b8fd6a5deff5
-  data.tar.gz: bb5721411884d7876ade5bc04c6304308faf0e4090d3153126367943ccf6d4f2
+  metadata.gz: 525b6a9075032237a7a0432d2c7e016d60864f5bffa4cf1be154f55b80a295ab
+  data.tar.gz: c0bc73ad7426ec048475bd55cbb9338349cb3b498ae03e281a2be5acef923e5a
 SHA512:
-  metadata.gz: 48814c53dada3769d467a63f15817f07b4c94139b7127aa5befe42b1cce4e3d186baa620a88a9156ccc1ac35170530a1bf6036b4951b3e1adf66d69e628788ed
-  data.tar.gz: ca25c8a16952c3af5f9415ded1b30fe76ff9ea37bf7892a264b41b6c86432a1fcc787ce3d9e1be05407cfa7a502828a059b6d97d00cbe886024a249e301bf8ff
+  metadata.gz: 67890b5331b7474ac34566e3f6781f9eef91b4993238520b0c4a3584acfde5a41a2adafaa8eccd80aca32fbcdc4cbfabca51da40c5e07f3eb6e12cf9ad0b0d03
+  data.tar.gz: a4996b26068c591881df3b2d8bc88ccb88b08f4501250765488a5f30553d2346e7a2f42e63133a0b39183f3679d7debace57140b4601855b6646e9d050ed03e3

data/.rubocop_todo.yml

@@ -151,7 +151,7 @@ RSpec/MultipleDescribes:
 
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 19
+  Max: 20
 
 # Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:

data/CHANGELOG.md

@@ -1,7 +1,25 @@
 # Changelog
 
+## [4.41.0](https://github.com/voxpupuli/beaker/tree/4.41.0) (2023-11-15)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.40.2...4.41.0)
+
+**Implemented enhancements:**
+
+- \[PA-5938\] Add support for debian & amazon linux in beaker 4.x [\#1828](https://github.com/voxpupuli/beaker/pull/1828) ([span786](https://github.com/span786))
+
+## [4.40.2](https://github.com/voxpupuli/beaker/tree/4.40.2) (2023-07-26)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.40.1...4.40.2)
+
+**Fixed bugs:**
+
+- Fix Minitest capitalization [\#1818](https://github.com/voxpupuli/beaker/pull/1818) ([mhashizume](https://github.com/mhashizume))
+
 ## [4.40.1](https://github.com/voxpupuli/beaker/tree/4.40.1) (2023-05-05)
 
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/4.40.0...4.40.1)
+
 **Merged Changes:**
 
 - in-parallel: Allow 1.x [\#1813](https://github.com/voxpupuli/beaker/pull/1813) ([bastelfreak](https://github.com/bastelfreak))
@@ -18,20 +36,23 @@
 
 [Full Changelog](https://github.com/voxpupuli/beaker/compare/4.38.1...4.39.0)
 
-**Fixed bugs:**
-
-- Extend list of permitted classes for YAML safe load and allow aliases [\#1758](https://github.com/voxpupuli/beaker/pull/1758) ([nmburgan](https://github.com/nmburgan))
-
 **Implemented enhancements:**
 
-- Add Rubocop [\#1761](https://github.com/voxpupuli/beaker/pull/1761) ([ekohl](https://github.com/ekohl))
-- Update net-scp requirement from >= 1.2, < 4.0 to >= 1.2, < 5.0 [\#1757](https://github.com/voxpupuli/beaker/pull/1757)
 - \(maint\) StringInclude Rubocop corrections [\#1765](https://github.com/voxpupuli/beaker/pull/1765) ([mhashizume](https://github.com/mhashizume))
+- Add Rubocop [\#1761](https://github.com/voxpupuli/beaker/pull/1761) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- Extend list of permitted classes for YAML safe load and allow aliases [\#1758](https://github.com/voxpupuli/beaker/pull/1758) ([nmburgan](https://github.com/nmburgan))
 
 **Closed issues:**
 
 - Ruby 3.1/Psych 4 compatibility issues [\#1753](https://github.com/voxpupuli/beaker/issues/1753)
 
+**Merged pull requests:**
+
+- Update net-scp requirement from \>= 1.2, \< 4.0 to \>= 1.2, \< 5.0 [\#1757](https://github.com/voxpupuli/beaker/pull/1757) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [4.38.1](https://github.com/voxpupuli/beaker/tree/4.38.1) (2022-09-21)
 
 [Full Changelog](https://github.com/voxpupuli/beaker/compare/4.38.0...4.38.1)

data/acceptance/lib/helpers/test_helper.rb

@@ -59,7 +59,7 @@ end
 #      assert_equal expected, user
 #    end
 #
-# Absorbs any MiniTest::Assertion from a failing test assertion in the block.
+# Absorbs any Minitest::Assertion from a failing test assertion in the block.
 # This implies that the intermittent failure is caught and the suite will not
 # go red for this failure. Intended to be used with the Jenkins Build Failure
 # Analyzer (or similar), to detect these failures without failing the build.
@@ -69,7 +69,7 @@ def fails_intermittently(issue_link, args = {})
   raise ArgumentError, "provide a Jira ticket link" unless issue_link
   raise ArgumentError, "a block is required" unless block_given?
   yield
-rescue MiniTest::Assertion, StandardError, SignalException # we have a test failure!
+rescue Minitest::Assertion, StandardError, SignalException # we have a test failure!
   STDERR.puts "\n\nIntermittent test failure! See: #{issue_link}"
 
   if args.empty?

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

@@ -280,7 +280,7 @@ module Unix::Exec
     case self['platform']
     when /debian|ubuntu|cumulus|huaweios/
       exec(Beaker::Command.new("service ssh restart"))
-    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|el-8|centos-8|redhat-8|oracle-8|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
+    when /amazon|el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|el-8|centos-8|redhat-8|oracle-8|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
       exec(Beaker::Command.new("systemctl restart sshd.service"))
     when /el-|centos|fedora|redhat|oracle|scientific|eos/
       exec(Beaker::Command.new("/sbin/service sshd restart"))
@@ -302,8 +302,8 @@ module Unix::Exec
   #   (from {#ssh_service_restart}).
   def ssh_permit_user_environment
     case self['platform']
-    when /debian|ubuntu|cumulus|huaweios|archlinux|el-|centos|fedora|redhat|oracle|scientific|eos|opensuse|sles|solaris/
-      directory = tmpdir()
+    when /amazon|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 /ubuntu-2(0|2).04/.match?(self['platform'])

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

@@ -88,7 +88,7 @@ module Unix::File
   # @return [String] Path to package config dir
   def package_config_dir
     case self['platform']
-    when /fedora|el-|redhat|centos/
+    when /amazon|fedora|el-|redhat|centos/
       '/etc/yum.repos.d/'
     when /opensuse|sles/
       '/etc/zypp/repos.d/'
@@ -154,7 +154,7 @@ module Unix::File
   # @return [String] Type of repo (rpm|deb)
   def repo_type
     case self['platform']
-    when /fedora|el-|redhat|centos|opensuse|sles/
+    when /amazon|fedora|el-|redhat|centos|opensuse|sles/
       'rpm'
     when /debian|ubuntu|cumulus|huaweios/
       'deb'

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

@@ -40,7 +40,7 @@ module Unix::Pkg
       when /el-4/
         @logger.debug("Package query not supported on rhel4")
         return false
-      when /cisco|fedora|centos|redhat|eos|el-/
+      when /amazon|cisco|fedora|centos|redhat|eos|el-/
         result = execute("rpm -q #{name}", opts) { |result| result }
       when /ubuntu|debian|cumulus|huaweios/
         result = execute("dpkg -s #{name}", opts) { |result| result }
@@ -96,7 +96,7 @@ module Unix::Pkg
           name = "#{name}-#{version}"
         end
         execute("dnf -y #{cmdline_args} install #{name}", opts)
-      when /cisco|fedora|centos|redhat|eos|el-/
+      when /amazon|cisco|fedora|centos|redhat|eos|el-/
         if version
           name = "#{name}-#{version}"
         end
@@ -179,26 +179,26 @@ module Unix::Pkg
 
   def uninstall_package(name, cmdline_args = '', opts = {})
     case self['platform']
-      when /opensuse|sles-/
-        execute("zypper --non-interactive rm #{name}", opts)
-      when /el-4/
-        @logger.debug("Package uninstallation not supported on rhel4")
-      when /edora-(2[2-9]|3[0-9])/
-        execute("dnf -y #{cmdline_args} remove #{name}", opts)
-      when /cisco|fedora|centos|redhat|eos|el-/
-        execute("yum -y #{cmdline_args} remove #{name}", opts)
-      when /ubuntu|debian|cumulus|huaweios/
-        execute("apt-get purge #{cmdline_args} -y #{name}", opts)
-      when /solaris-11/
-        execute("pkg #{cmdline_args} uninstall #{name}", opts)
-      when /solaris-10/
-        execute("pkgrm -n #{cmdline_args} #{name}", opts)
-      when /aix/
-        execute("rpm #{cmdline_args} -e #{name}", opts)
-      when /archlinux/
-        execute("pacman -R --noconfirm #{cmdline_args} #{name}", opts)
-      else
-        raise "Package #{name} cannot be installed on #{self}"
+    when /opensuse|sles-/
+      execute("zypper --non-interactive rm #{name}", opts)
+    when /el-4/
+      @logger.debug("Package uninstallation not supported on rhel4")
+    when /amazon|fedora-(2[2-9]|3[0-9])/
+      execute("dnf -y #{cmdline_args} remove #{name}", opts)
+    when /cisco|fedora|centos|redhat|eos|el-/
+      execute("yum -y #{cmdline_args} remove #{name}", opts)
+    when /ubuntu|debian|cumulus|huaweios/
+      execute("apt-get purge #{cmdline_args} -y #{name}", opts)
+    when /solaris-11/
+      execute("pkg #{cmdline_args} uninstall #{name}", opts)
+    when /solaris-10/
+      execute("pkgrm -n #{cmdline_args} #{name}", opts)
+    when /aix/
+      execute("rpm #{cmdline_args} -e #{name}", opts)
+    when /archlinux/
+      execute("pacman -R --noconfirm #{cmdline_args} #{name}", opts)
+    else
+      raise "Package #{name} cannot be installed on #{self}"
     end
   end
 
@@ -527,9 +527,9 @@ module Unix::Pkg
   def install_local_package(onhost_package_file, onhost_copy_dir = nil)
     variant, version, _arch, _codename = self['platform'].to_array
     case variant
-    when /^(fedora|el|redhat|centos)$/
+    when /^(amazon|fedora|el|redhat|centos)$/
       command_name = 'yum'
-      command_name = 'dnf' if variant == 'fedora' && version.to_i > 21
+      command_name = 'dnf' if (variant == 'fedora' && version.to_i > 21) || (variant == 'amazon' && version.to_i >= 2023)
       execute("#{command_name} --nogpgcheck localinstall -y #{onhost_package_file}")
     when /^(opensuse|sles)$/
       execute("zypper --non-interactive --no-gpg-checks in #{onhost_package_file}")
@@ -557,7 +557,7 @@ module Unix::Pkg
   def uncompress_local_tarball(onhost_tar_file, onhost_base_dir, download_file)
     variant, version, _arch, _codename = self['platform'].to_array
     case variant
-    when /^(fedora|el|centos|redhat|opensuse|sles|debian|ubuntu|cumulus)$/
+    when /^(amazon|fedora|el|centos|redhat|opensuse|sles|debian|ubuntu|cumulus)$/
       execute("tar -zxvf #{onhost_tar_file} -C #{onhost_base_dir}")
     when /^solaris$/
       # uncompress PE puppet-agent tarball

data/lib/beaker/host_prebuilt_steps.rb

@@ -12,7 +12,8 @@ module Beaker
     NTPSERVER = 'pool.ntp.org'
     SLEEPWAIT = 5
     TRIES = 5
-    RHEL8_PACKAGES = ['curl', 'chrony']
+    AMAZON2023_PACKAGES = %w[curl-minimal chrony]
+    RHEL8_PACKAGES = %w[curl chrony]
     RHEL9_PACKAGES = ['chrony']
     FEDORA_PACKAGES = ['curl', 'chrony']
     UNIX_PACKAGES = ['curl', 'ntpdate']
@@ -54,7 +55,7 @@ module Beaker
           logger.notify "NTP date succeeded on #{host}"
         else
           case
-          when /el-[89]|fedora/.match?(host['platform'])
+          when /amazon|el-[89]|fedora/.match?(host['platform'])
             ntp_command = "chronyc add server #{ntp_server} prefer trust;chronyc makestep;chronyc burst 1/2"
           when /opensuse-|sles-/.match?(host['platform'])
             ntp_command = "sntp #{ntp_server}"
@@ -114,6 +115,8 @@ module Beaker
     # @return [Array<String>] A list of packages to install
     def host_packages(host)
       case host['platform']
+      when /amazon/
+        AMAZON2023_PACKAGES
       when /el-8/
         RHEL8_PACKAGES
       when /el-9/
@@ -461,9 +464,9 @@ module Beaker
         end
         #restart sshd
         if /debian|ubuntu|cumulus/.match?(host['platform'])
-          host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
-        elsif /arch|(centos|el|redhat)-[789]|fedora-(1[4-9]|2[0-9]|3[0-9])/.match?(host['platform'])
-          host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
+          host.exec(Command.new("sudo su -c \"service ssh restart\""), { :pty => true })
+        elsif /amazon|arch|(centos|el|redhat)-[789]|fedora-(1[4-9]|2[0-9]|3[0-9])/.match?(host['platform'])
+          host.exec(Command.new("sudo -E systemctl restart sshd.service"), { :pty => true })
         elsif /centos|el-|redhat|fedora|eos/.match?(host['platform'])
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
         elsif /(free|open)bsd/.match?(host['platform'])
@@ -520,10 +523,10 @@ module Beaker
       block_on host do |host|
         logger.debug("enabling proxy support on #{host.name}")
         case host['platform']
-          when /ubuntu/, /debian/, /cumulus/
-            host.exec(Command.new("echo 'Acquire::http::Proxy \"#{opts[:package_proxy]}/\";' >> /etc/apt/apt.conf.d/10proxy"))
-          when /^el-/, /centos/, /fedora/, /redhat/, /eos/
-            host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
+        when /ubuntu/, /debian/, /cumulus/
+          host.exec(Command.new("echo 'Acquire::http::Proxy \"#{opts[:package_proxy]}/\";' >> /etc/apt/apt.conf.d/10proxy"))
+        when /amazon/, /^el-/, /centos/, /fedora/, /redhat/, /eos/
+          host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
         else
           logger.debug("Attempting to enable package manager proxy support on non-supported platform: #{host.name}: #{host['platform']}")
         end

data/lib/beaker/perf.rb

@@ -4,8 +4,8 @@ module Beaker
 
     PERF_PACKAGES = ['sysstat']
     # SLES does not treat sysstat as a service that can be started
-    PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|opensuse|sles/
-    PERF_START_PLATFORMS     = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus/
+    PERF_SUPPORTED_PLATFORMS = /amazon|debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|opensuse|sles/
+    PERF_START_PLATFORMS     = /amazon|debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus/
 
     # Create the Perf instance and runs setup_perf_on_host on all hosts if --collect-perf-data
     # was used as an option on the Baker command line invocation. Instances of this class do not
@@ -50,7 +50,7 @@ module Beaker
         @logger.perf_output("Enabling aggressive sysstat polling")
         if /debian|ubuntu/.match?(host['platform'])
           host.exec(Command.new('sed -i s/5-55\\\/10/*/ /etc/cron.d/sysstat'))
-        elsif /centos|el|fedora|oracle|redhat|scientific/.match?(host['platform'])
+        elsif /amazon|centos|el|fedora|oracle|redhat|scientific/.match?(host['platform'])
           host.exec(Command.new('sed -i s/*\\\/10/*/ /etc/cron.d/sysstat'))
         end
       end

data/lib/beaker/platform.rb

@@ -3,24 +3,26 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(alpine|huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
+    PLATFORMS = /^(alpine|amazon|huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
-      { :debian => { "bullseye"  => "11",
-                     "buster"    => "10",
-                     "stretch"   => "9",
-                     "jessie"    => "8",
-                     "wheezy"    => "7",
-                     "squeeze"   => "6",
-                   },
-        :ubuntu => { "jammy"   => "2204",
-                     "focal"   => "2004",
-                     "eoan"    => "1910",
-                     "disco"   => "1904",
-                     "cosmic"  => "1810",
-                     "bionic"  => "1804",
-                     "artful"  => "1710",
-                     "zesty"   => "1704",
+      { :debian => { "forky" => "14",
+                     "trixie" => "13",
+                     "bookworm" => "12",
+                     "bullseye" => "11",
+                     "buster" => "10",
+                     "stretch" => "9",
+                     "jessie" => "8",
+                     "wheezy" => "7",
+                     "squeeze" => "6", },
+        :ubuntu => { "jammy" => "2204",
+                     "focal" => "2004",
+                     "eoan" => "1910",
+                     "disco" => "1904",
+                     "cosmic" => "1810",
+                     "bionic" => "1804",
+                     "artful" => "1710",
+                     "zesty" => "1704",
                      "yakkety" => "1610",
                      "xenial"  => "1604",
                      "wily"    => "1510",
@@ -57,6 +59,7 @@ module Beaker
     # Creates the Platform object.  Checks to ensure that the platform String
     # provided meets the platform formatting rules.  Platforms name must be of
     # the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
+    # * amazon
     # * huaweios
     # * cisco_nexus
     # * cisco_ios_xr

data/lib/beaker/test_case.rb

@@ -22,7 +22,7 @@ module Beaker
     include Beaker::DSL
 
     # The Exception raised by Ruby's STDLIB's test framework (Ruby 1.9)
-    TEST_EXCEPTION_CLASS = ::MiniTest::Assertion
+    TEST_EXCEPTION_CLASS = ::Minitest::Assertion
 
     # Necessary for implementing {Beaker::DSL::Helpers#confine}.
     # Assumed to be an array of valid {Beaker::Host} objects for

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.40.1'
+    STRING = '4.41.0'
   end
 end

data/lib/beaker.rb

@@ -36,6 +36,6 @@ module Beaker
   # Shared methods and helpers
   require 'beaker/shared'
 
-  # MiniTest, for including MiniTest::Assertions
+  # Minitest, for including Minitest::Assertions
   require 'minitest/test'
 end

data/spec/beaker/dsl/assertions_spec.rb

@@ -79,7 +79,7 @@ EXPECT
         expect( result ).to receive( :output ).and_return( output )
 
         expect( subject ).to receive( :result ).at_least( :once ).and_return( result )
-        expect { subject.assert_output expectation }.to raise_error( MiniTest::Assertion )
+        expect { subject.assert_output expectation }.to raise_error( Minitest::Assertion )
       end
     end
   end

data/spec/beaker/dsl/structure_spec.rb

@@ -197,11 +197,11 @@ describe ClassMixedWithDSLStructure do
   end
 
   describe '#expect_failure' do
-    it 'passes when a MiniTest assertion is raised' do
+    it 'passes when a Minitest assertion is raised' do
       expect( subject ).to receive( :logger ).and_return( logger )
       expect( logger ).to receive( :notify )
       # We changed this lambda to use the simplest assert possible; using assert_equal
-      # caused an error in minitest 5.9.0 trying to write to the file system.
+      # caused an error in Minitest 5.9.0 trying to write to the file system.
       block = lambda { assert(false, 'this assertion should be caught') }
       expect{ subject.expect_failure 'this is an expected failure', &block }.not_to raise_error
     end
@@ -213,9 +213,9 @@ describe ClassMixedWithDSLStructure do
       expect{ subject.expect_failure 'this is an expected failure', &block }.not_to raise_error
     end
 
-    it 'fails when a non-Beaker, non-MiniTest assertion is raised' do
-      block = lambda { raise 'not a Beaker or MiniTest error' }
-      expect{ subject.expect_failure 'this has a non-Beaker, non-MiniTest exception', &block }.to raise_error(RuntimeError, /not a Beaker or MiniTest error/)
+    it 'fails when a non-Beaker, non-Minitest assertion is raised' do
+      block = lambda { raise 'not a Beaker or Minitest error' }
+      expect{ subject.expect_failure 'this has a non-Beaker, non-Minitest exception', &block }.to raise_error(RuntimeError, /not a Beaker or Minitest error/)
     end
 
     it 'fails when no assertion is raised' do

data/spec/beaker/host/mac/group_spec.rb

@@ -52,7 +52,7 @@ EOS
       result.stdout = ''
       group_name = 'any_name'
       expect( subject ).to receive( :execute ).and_yield(result)
-      expect { subject.group_get(group_name) }.to raise_error(MiniTest::Assertion, "failed to get group #{group_name}")
+      expect { subject.group_get(group_name) }.to raise_error(Minitest::Assertion, "failed to get group #{group_name}")
     end
 
     it 'parses mac dscacheutil output into /etc/group format correctly' do

data/spec/beaker/host/mac/user_spec.rb

@@ -63,7 +63,7 @@ EOS
       result.stdout = ''
       user_name = 'any_name'
       expect( subject ).to receive( :execute ).and_yield(result)
-      expect { subject.user_get(user_name) }.to raise_error(MiniTest::Assertion, "failed to get user #{user_name}")
+      expect { subject.user_get(user_name) }.to raise_error(Minitest::Assertion, "failed to get user #{user_name}")
     end
 
     it 'yields correctly with the result object' do

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

@@ -36,8 +36,7 @@ module Beaker
     let(:instance) { UnixFileTest.new(opts.merge(platform), logger) }
 
     describe '#repo_type' do
-
-      ['centos','redhat'].each do |platform|
+      %w[amazon centos redhat].each do |platform|
         it "returns correctly for platform '#{platform}'" do
           @platform = "#{platform}-5-x86_64"
           expect( instance.repo_type ).to be === 'rpm'
@@ -58,8 +57,7 @@ module Beaker
     end
 
     describe '#package_config_dir' do
-
-      ['centos','redhat'].each do |platform|
+      %w[amazon centos redhat].each do |platform|
         it "returns correctly for platform '#{platform}'" do
           @platform = "#{platform}-5-x86_64"
           expect( instance.package_config_dir ).to be === '/etc/yum.repos.d/'

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

@@ -127,7 +127,7 @@ module Beaker
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
-      ['centos','redhat'].each do |platform|
+      %w[amazon centos redhat].each do |platform|
         it "checks correctly on #{platform}" do
           @opts = {'platform' => "#{platform}-is-me"}
           pkg = "#{platform}_package"
@@ -267,12 +267,20 @@ module Beaker
         end
       end
 
+      it "uses dnf on amazon-2023" do
+        @opts = { 'platform' => "amazon-2023-is-me" }
+        pkg = 'amazon_package'
+        expect(Beaker::Command).to receive(:new).with("yum -y  install #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
+        expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
+        expect(instance.install_package(pkg)).to be == "hello"
+      end
+
       it "uses pacman on archlinux" do
-        @opts = {'platform' => 'archlinux-is-me'}
+        @opts = { 'platform' => 'archlinux-is-me' }
         pkg = 'archlinux_package'
-        expect( Beaker::Command ).to receive(:new).with("pacman -S --noconfirm  #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
-        expect( instance.install_package(pkg) ).to be == "hello"
+        expect(Beaker::Command).to receive(:new).with("pacman -S --noconfirm  #{pkg}", [], { :prepend_cmds => nil, :cmdexe => false }).and_return('')
+        expect(instance).to receive(:exec).with('', {}).and_return(generate_result("hello", { :exit_code => 0 }))
+        expect(instance.install_package(pkg)).to be == "hello"
       end
     end
 
@@ -531,7 +539,15 @@ module Beaker
       let( :version       ) { @version  || 6        }
 
       before do
-        allow( instance ).to receive( :[] ).with( 'platform' ) { Beaker::Platform.new("#{platform}-#{version}-x86_64") }
+        allow(instance).to receive(:[]).with('platform') { Beaker::Platform.new("#{platform}-#{version}-x86_64") }
+      end
+
+      it 'amazon-2023: uses dnf' do
+        @platform = platform
+        @version = '2023'
+        package_file = 'test_123.yay'
+        expect(instance).to receive(:execute).with(/^dnf.*#{package_file}$/)
+        instance.install_local_package(package_file)
       end
 
       it 'Fedora 22-39: uses dnf' do
@@ -654,4 +670,3 @@ module Beaker
     end
   end
 end
-

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -13,6 +13,7 @@ describe Beaker do
   let( :sles_only_pkgs ) { Beaker::HostPrebuiltSteps::SLES_PACKAGES }
   let( :rhel8_packages ) { Beaker::HostPrebuiltSteps::RHEL8_PACKAGES }
   let( :fedora_packages) { Beaker::HostPrebuiltSteps::FEDORA_PACKAGES }
+  let(:amazon2023_packages) { Beaker::HostPrebuiltSteps::AMAZON2023_PACKAGES }
   let( :platform )       { @platform || 'unix' }
   let( :ip )             { "ip.address.0.0" }
   let( :stdout)          { @stdout || ip }
@@ -87,7 +88,12 @@ describe Beaker do
     "if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"
   ], true
 
-  ['debian','ubuntu','cumulus'].each do | deb_like |
+  it_behaves_like 'enables_root_login', 'amazon-2023', [
+    "sudo -E systemctl restart sshd.service",
+    "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
+  ]
+
+  %w[debian ubuntu cumulus].each do |deb_like|
     it_behaves_like 'enables_root_login', deb_like, [
       "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
       "sudo su -c \"service ssh restart\""
@@ -144,12 +150,20 @@ describe Beaker do
     end
 
     it "can sync time on Sles hosts" do
-      hosts = make_hosts( { :platform => 'sles-13.1-x64' } )
+      hosts = make_hosts({ :platform => 'sles-13.1-x64' })
 
-      expect( Beaker::Command ).to receive( :new ).with("sntp #{ntpserver}").exactly( 3 ).times
+      expect(Beaker::Command).to receive(:new).with("sntp #{ntpserver}").exactly(3).times
 
-      subject.timesync( hosts, options )
+      subject.timesync(hosts, options)
+    end
 
+    it "can sync time on amazon2023 hosts" do
+      hosts = make_hosts(:platform => 'amazon-2023-x86_64')
+      expect(Beaker::Command).to receive(:new)
+        .with("chronyc add server #{ntpserver} prefer trust;chronyc makestep;chronyc burst 1/2")
+        .exactly(3)
+        .times
+      subject.timesync(hosts, options)
     end
 
     it "can sync time on RHEL8 hosts" do
@@ -489,6 +503,19 @@ describe Beaker do
       subject.validate_host(hosts, options)
     end
 
+    it "can validate Amazon hosts" do
+      @platform = 'amazon-2023-x86_64'
+
+      hosts.each do |host|
+        amazon2023_packages.each do |pkg|
+          expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
+          expect(host).to receive(:install_package).with(pkg).once
+        end
+      end
+
+      subject.validate_host(hosts, options)
+    end
+
     it 'skips validation on cisco hosts' do
       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
@@ -533,7 +560,7 @@ describe Beaker do
       end
     end
 
-    ['centos','redhat'].each do |platform|
+    %w[amazon centos redhat].each do |platform|
       context "on platform '#{platform}'" do
         let(:host) { make_host( 'name', {
           :platform => platform,
@@ -635,7 +662,7 @@ describe Beaker do
       subject.package_proxy(host, options.merge( {'package_proxy' => proxyurl}) )
     end
 
-    ['centos','redhat'].each do |platform|
+    %w[amazon centos redhat].each do |platform|
       it "can set proxy config on a '#{platform}' host" do
         host = make_host('name', { :platform => platform } )
 

data/spec/beaker/platform_spec.rb

@@ -66,6 +66,20 @@ module Beaker
     end
 
     context 'with_version_codename' do
+      it "can convert debian-14-xxx to debian-forky-xxx" do
+        @name = 'debian-14-xxx'
+        expect(platform.with_version_codename).to be === 'debian-forky-xxx'
+      end
+
+      it "can convert debian-13-xxx to debian-trixie-xxx" do
+        @name = 'debian-13-xxx'
+        expect(platform.with_version_codename).to be === 'debian-trixie-xxx'
+      end
+
+      it "can convert debian-12-xxx to debian-bookworm-xxx" do
+        @name = 'debian-12-xxx'
+        expect(platform.with_version_codename).to be === 'debian-bookworm-xxx'
+      end
 
       it "can convert debian-11-xxx to debian-bullseye-xxx" do
         @name = 'debian-11-xxx'

data/spec/helpers.rb

@@ -132,16 +132,17 @@ module PlatformHelpers
 
   FEDORASYSTEMD    = (14..39).to_a.collect! { |i| "fedora-#{i}" }
 
-  SYSTEMDPLATFORMS = ['el-7',
-                      'centos-7',
-                      'redhat-7',
-                      'oracle-7',
-                      'scientific-7',
-                      'eos-7',
-                      'el-8',
-                      'centos-8',
-                      'redhat-8',
-                      'oracle-8'].concat(FEDORASYSTEMD)
+  SYSTEMDPLATFORMS = %w[amazon-2023
+                        el-7
+                        centos-7
+                        redhat-7
+                        oracle-7
+                        scientific-7
+                        eos-7
+                        el-8
+                        centos-8
+                        redhat-8
+                        oracle-8].concat(FEDORASYSTEMD)
 
   FEDORASYSTEMV    = (1..13).to_a.collect! { |i| "fedora-#{i}" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.40.1
+  version: 4.41.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs