beaker 6.2.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77c1a3954ba46fdb90013e09113edb3b0e9f4976da6ed8598befc0e0c4faf54a
-  data.tar.gz: 8a514875b6013196ee000cd5fe1fa430057c80408511d6e6be1e28c37fd6e651
+  metadata.gz: 1a02ef74d16885231f54a0de64150eba5ff7cfa6bc944c8e31e833dbeb6ebf0c
+  data.tar.gz: 314c9cba9fc50a0966f3bd4d49624041eac4b25dea6dd46cd0e85e1781a95577
 SHA512:
-  metadata.gz: b142270c19368140de4dc01202d20c366d2ea914704c00d37eefb869d92136858063935b1780e8b08e0cc5afc1accd605951d93da06994584945fcbd8f97e9ca
-  data.tar.gz: cd3e194d4e98dfcf5c01eeb22ede113561c20ae54d90d3ce8e95cfa19b864d5ca65bbc0e3f4f25b583354100b7177e71d73620652ca7ad34c7991fb3c47aa5f1
+  metadata.gz: da309a092cffe2872e0927d5d304d1beb62a618f0c5c223e2cefc723ac3edb7473a3b3ab42f5e3682af2f75a622e158e150258126d0528453e80d1960d7aee3b
+  data.tar.gz: cacc9f2b9679f618c71eda3c4f8de1960f476fb9bbe155a3577a1e7a22cd92d3be9753fc251ac0b7db4e36e214b4da69b4a4cb6c42812aed6f5791d0e9e7fba5

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [6.4.0](https://github.com/voxpupuli/beaker/tree/6.4.0) (2024-08-27)
+
+**Implemented enhancements:**
+
+- Only install timesync packages if needed [\#1853](https://github.com/voxpupuli/beaker/pull/1853)
+- Ensure platform is Beaker::Platform in tests [\#1855](https://github.com/voxpupuli/beaker/pull/1855)
+- Avoid mocking stdout on host and use explicit hosts in host_prebuilt_steps_spec.rb [\#1900](https://github.com/voxpupuli/beaker/pull/1900)
+
+## [6.3.0](https://github.com/voxpupuli/beaker/tree/6.3.0) (2024-08-13)
+
+**Implemented enhancements:**
+
+- build(deps): update minitar requirement from ~> 0.6 to ~> 0.12 [\#1895](https://github.com/voxpupuli/beaker/pull/1895)
+
+**Fixed bugs:**
+
+- Arch Linux: Generate keyring before installing packages [\#1897](https://github.com/voxpupuli/beaker/pull/1897) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [6.2.0](https://github.com/voxpupuli/beaker/tree/6.2.0) (2024-07-24)
 
 **Implemented enhancements:**

data/acceptance/tests/base/host/packages.rb

@@ -1,29 +1,6 @@
 test_name 'confirm packages on hosts behave correctly'
 confine :except, :platform => %w(osx)
 
-def get_host_pkg(host)
-  case host['platform']
-  when /sles-10/
-    Beaker::HostPrebuiltSteps::SLES10_PACKAGES
-  when /opensuse|sles-/
-    Beaker::HostPrebuiltSteps::SLES_PACKAGES
-  when /debian/
-    Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES
-  when /windows/
-    host.is_cygwin? ? Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES : Beaker::HostPrebuiltSteps::PSWINDOWS_PACKAGES
-  when /freebsd/
-    Beaker::HostPrebuiltSteps::FREEBSD_PACKAGES
-  when /openbsd/
-    Beaker::HostPrebuiltSteps::OPENBSD_PACKAGES
-  when /solaris-10/
-    Beaker::HostPrebuiltSteps::SOLARIS10_PACKAGES
-  when /el-[89]/
-    Beaker::HostPrebuiltSteps::RHEL8_PACKAGES
-  else
-    Beaker::HostPrebuiltSteps::UNIX_PACKAGES
-  end
-end
-
 step '#check_for_command : can determine where a command exists'
 hosts.each do |host|
   logger.debug "echo package should be installed on #{host}"
@@ -34,7 +11,7 @@ end
 
 step '#check_for_package : can determine if a package is installed'
 hosts.each do |host|
-  package = get_host_pkg(host)[0]
+  package = 'bash'
 
   logger.debug "#{package} package should be installed on #{host}"
   assert(host.check_for_package(package), "'#{package}' should be installed")

data/beaker.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'voxpupuli-rubocop', '~> 2.8.0'
 
   # Run time dependencies
-  s.add_runtime_dependency 'minitar', '~> 0.6'
+  s.add_runtime_dependency 'minitar', '~> 0.12' # newer versions require Ruby 3.1
   s.add_runtime_dependency 'minitest', '~> 5.4'
   s.add_runtime_dependency 'rexml', '~> 3.2', '>= 3.2.5'
 

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

@@ -74,6 +74,10 @@ module Unix::Pkg
     return unless self['platform'].include?('archlinux')
     return unless @pacman_needs_update
 
+    # creates a GPG key + local keyring
+    execute("pacman-key --init")
+    # `archlinux-keyring` contains GPG keys that will be imported into the local keyring
+    # used to verify package signatures
     execute("pacman --sync --noconfirm --noprogressbar --refresh archlinux-keyring")
     execute("pacman --sync --noconfirm --noprogressbar --refresh --sysupgrade --ignore linux --ignore linux-docs --ignore linux-headers")
     @pacman_needs_update = false

data/lib/beaker/host_prebuilt_steps.rb

@@ -10,20 +10,6 @@ module Beaker
     NTPSERVER = 'pool.ntp.org'
     SLEEPWAIT = 5
     TRIES = 5
-    AMAZON2023_PACKAGES = %w[chrony]
-    RHEL8_PACKAGES = %w[chrony iputils] # iputils provides ping. beaker assumes that's present
-    FEDORA_PACKAGES = %w[chrony iputils]
-    UNIX_PACKAGES = %w[curl ntpdate]
-    FREEBSD_PACKAGES = ['curl', 'perl5|perl']
-    OPENBSD_PACKAGES = ['curl']
-    ARCHLINUX_PACKAGES = %w[curl ntp net-tools openssh]
-    WINDOWS_PACKAGES = ['curl']
-    PSWINDOWS_PACKAGES = []
-    SLES10_PACKAGES = ['curl']
-    SLES_PACKAGES = %w[curl ntp]
-    DEBIAN_PACKAGES = %w[curl ntpdate lsb-release apt-transport-https]
-    SOLARIS10_PACKAGES = %w[CSWcurl CSWntp wget]
-    SOLARIS11_PACKAGES = %w[curl ntp]
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
@@ -48,7 +34,7 @@ module Beaker
           host.exec(Command.new("w32tm /resync"))
           logger.notify "NTP date succeeded on #{host}"
         else
-          if /amazon|el-[89]|fedora/.match?(host['platform'])
+          if host['platform'].uses_chrony?
             ntp_command = "chronyc add server #{ntp_server} prefer trust;chronyc makestep;chronyc burst 1/2"
           elsif /opensuse-|sles-/.match?(host['platform'])
             ntp_command = "sntp #{ntp_server}"
@@ -79,12 +65,6 @@ module Beaker
     # Validate that hosts are prepared to be used as SUTs, if packages are missing attempt to
     # install them.
     #
-    # Verifies the presence of #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts,
-    # {HostPrebuiltSteps::SLES_PACKAGES} on SUSE platform hosts,
-    # {HostPrebuiltSteps::DEBIAN_PACKAGES} on debian platform hosts,
-    # {HostPrebuiltSteps::WINDOWS_PACKAGES} on cygwin-installed windows platform hosts,
-    # and {HostPrebuiltSteps::PSWINDOWS_PACKAGES} on non-cygwin windows platform hosts.
-    #
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
@@ -102,44 +82,14 @@ module Beaker
     # @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 /amazon/
-        AMAZON2023_PACKAGES
-      when /el-[89]/
-        RHEL8_PACKAGES
-      when /sles-10/
-        SLES10_PACKAGES
-      when /opensuse|sles-/
-        SLES_PACKAGES
-      when /debian/
-        DEBIAN_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 !/aix|solaris|osx-/.match?(host['platform'])
-          UNIX_PACKAGES
-        else
-          []
-        end
+      packages = host['platform'].base_packages
+      if host.is_cygwin?
+        raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
+
+        packages << 'curl'
       end
+      packages += host['platform'].timesync_packages if host[:timesync]
+      packages
     end
 
     # Installs the given packages if they aren't already on a host

data/lib/beaker/platform.rb

@@ -100,5 +100,60 @@ module Beaker
     def with_version_number
       [@variant, @version, @arch].join('-')
     end
+
+    def uses_chrony?
+      case @variant
+      when 'amazon', 'fedora'
+        true
+      when 'el'
+        @version.to_i >= 8
+      else
+        false
+      end
+    end
+
+    # Return a list of packages that should always be present.
+    #
+    # @return [Array<String>] A list of packages to install
+    def base_packages
+      case @variant
+      when 'el'
+        @version.to_i >= 8 ? ['curl-minimal', 'iputils'] : %w[curl]
+      when 'debian'
+        %w[curl lsb-release apt-transport-https]
+      when 'freebsd'
+        %w[curl perl5|perl]
+      when 'solaris'
+        @version.to_i >= 11 ? %w[curl] : %w[CSWcurl wget]
+      when 'archlinux'
+        %w[curl net-tools openssh]
+      when 'amazon', 'fedora'
+        ['curl-minimal', 'iputils']
+      when 'aix', 'osx', 'windows'
+        []
+      else
+        %w[curl]
+      end
+    end
+
+    # Return a list of packages that are needed for timesync
+    #
+    # @return [Array<String>] A list of packages to install for timesync
+    def timesync_packages
+      return ['chrony'] if uses_chrony?
+
+      case @variant
+      when 'freebsd', 'openbsd', 'windows', 'aix', 'osx'
+        []
+      when 'archlinux', 'opensuse'
+        ['ntp']
+      when 'sles'
+        @version.to_i >= 11 ? %w[ntp] : []
+      when 'solaris'
+        @version.to_i >= 11 ? %w[ntp] : %w[CSWntp]
+      else
+        %w[ntpdate]
+      end
+    end
   end
 end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.2.0'
+    STRING = '6.4.0'
   end
 end

data/spec/beaker/command_spec.rb

@@ -125,7 +125,7 @@ module Beaker
       allow(h).to receive(:append_commands).and_return('')
       h
     end
-    let(:platform)    { @platform   || 'unix' }
+    let(:platform)    { @platform   || 'el-9-64' }
     let(:expression)  { @expression || 's/b/s/' }
     let(:filename)    { @filename   || '/fakefile' }
     let(:options)     { @options    || {} }

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

@@ -6,7 +6,7 @@ module Beaker
     let(:group) { 'somegroup' }
     let(:path) { 'C:\Foo\Bar' }
     let(:newpath) { '/Foo/Bar' }
-    let(:host)    { make_host('name', { :platform => 'windows' }) }
+    let(:host)    { make_host('name', { :platform => 'windows-11-64' }) }
 
     describe '#chown' do
       it 'calls cygpath first' do
@@ -60,7 +60,7 @@ module Beaker
       end
 
       it 'replaces backslashes with forward slashes when using BitVise and powershell' do
-        host = make_host('name', platform: 'windows', is_cygwin: false)
+        host = make_host('name', platform: 'windows-11-64', is_cygwin: false)
         allow(host).to receive(:determine_ssh_server).and_return(:bitvise)
         expect(host.scp_path(path)).to eq('C:/Windows')
       end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -6,22 +6,6 @@ describe Beaker do
   let(:options_ntp)    { make_opts.merge({ 'ntp_server' => ntpserver_set }) }
   let(:ntpserver)      { Beaker::HostPrebuiltSteps::NTPSERVER }
   let(:sync_cmd)       { Beaker::HostPrebuiltSteps::ROOT_KEYS_SYNC_CMD }
-  let(:windows_pkgs)   { Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES }
-  let(:unix_only_pkgs) { Beaker::HostPrebuiltSteps::UNIX_PACKAGES }
-  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 }
-  let(:hosts) do
-    hosts = make_hosts({ :stdout => stdout, :platform => platform })
-    hosts[0][:roles] = ['agent']
-    hosts[1][:roles] = %w[master dashboard agent database]
-    hosts[2][:roles] = ['agent']
-    hosts
-  end
   let(:dummy_class) { Class.new { include Beaker::HostPrebuiltSteps } }
 
   shared_examples 'enables_root_login' do |platform, commands, non_cygwin|
@@ -41,79 +25,75 @@ describe Beaker do
   end
 
   # Non-cygwin Windows
-  it_behaves_like 'enables_root_login', 'pswindows', [], false
+  it_behaves_like 'enables_root_login', 'windows-11-64', [], false
 
-  # Non-cygwin Windows
-  it_behaves_like 'enables_root_login', 'windows', [
+  # cygwin Windows
+  it_behaves_like 'enables_root_login', 'windows-11-64', [
     "sed -ri 's/^#?PermitRootLogin /PermitRootLogin yes/' /etc/sshd_config",
   ], true
 
   # FreeBSD
-  it_behaves_like 'enables_root_login', 'freesbd', [
-    "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
+  it_behaves_like 'enables_root_login', 'freebsd-14-64', [
+    "sudo sed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config",
+    "sudo /etc/rc.d/sshd restart",
   ], true
 
-  it_behaves_like 'enables_root_login', 'osx-10.10', [
+  it_behaves_like 'enables_root_login', 'osx-10.10-64', [
     "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config",
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config",
   ]
 
-  it_behaves_like 'enables_root_login', 'osx-10.11', [
+  it_behaves_like 'enables_root_login', 'osx-10.11-64', [
     "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
   ]
 
-  it_behaves_like 'enables_root_login', 'osx-10.12', [
+  it_behaves_like 'enables_root_login', 'osx-10.12-64', [
     "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
   ]
 
-  it_behaves_like 'enables_root_login', 'osx-10.13', [
+  it_behaves_like 'enables_root_login', 'osx-10.13-64', [
     "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
     "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /private/etc/ssh/sshd_config",
   ]
 
   # Solaris
-  it_behaves_like 'enables_root_login', 'solaris-10', [
+  it_behaves_like 'enables_root_login', 'solaris-10-64', [
     "sudo -E svcadm restart network/ssh",
     "sudo gsed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config",
   ], true
 
-  it_behaves_like 'enables_root_login', 'solaris-11', [
+  it_behaves_like 'enables_root_login', 'solaris-11-64', [
     "sudo -E svcadm restart network/ssh",
     "sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config",
     "if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi",
   ], true
 
-  it_behaves_like 'enables_root_login', 'amazon-2023', [
-    "sudo -E systemctl restart sshd.service",
+  it_behaves_like 'enables_root_login', 'amazon-2023-64', [
     "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
+    "sudo -E systemctl restart sshd.service",
   ]
 
-  %w[debian ubuntu].each do |deb_like|
+  %w[debian-12-64 ubuntu-2204-64].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\"",
     ]
   end
 
-  ['centos', 'el-', 'redhat'].each do |redhat_like|
+  ['centos-9-64', 'el-9-64', 'redhat-9-64', 'fedora-39-64'].each do |redhat_like|
     it_behaves_like 'enables_root_login', redhat_like, [
       "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
-      "sudo -E /sbin/service sshd reload",
+      "sudo -E systemctl restart sshd.service",
     ]
   end
 
-  it_behaves_like 'enables_root_login', 'fedora', [
-    "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
-    "sudo -E systemctl restart sshd.service",
-  ]
-
   context 'timesync' do
     subject { dummy_class.new }
 
-    it "can sync time on unix hosts" do
-      hosts = make_hosts({ :platform => 'unix' })
+    it "can sync time on el-7 hosts" do
+      hosts = make_hosts({ :platform => 'el-7-64' })
 
       expect(Beaker::Command).to receive(:new).with("ntpdate -u -t 20 #{ntpserver}").exactly(3).times
 
@@ -121,7 +101,7 @@ describe Beaker do
     end
 
     it "can retry on failure on unix hosts" do
-      hosts = make_hosts({ :platform => 'unix', :exit_code => [1, 0] })
+      hosts = make_hosts({ :platform => 'el-7-64', :exit_code => [1, 0] })
       allow(subject).to receive(:sleep).and_return(true)
 
       expect(Beaker::Command).to receive(:new).with("ntpdate -u -t 20 #{ntpserver}").exactly(6).times
@@ -130,7 +110,7 @@ describe Beaker do
     end
 
     it "eventually gives up and raises an error when unix hosts can't be synched" do
-      hosts = make_hosts({ :platform => 'unix', :exit_code => 1 })
+      hosts = make_hosts({ :platform => 'el-7-64', :exit_code => 1 })
       allow(subject).to receive(:sleep).and_return(true)
 
       expect(Beaker::Command).to receive(:new).with("ntpdate -u -t 20 #{ntpserver}").exactly(5).times
@@ -139,7 +119,7 @@ describe Beaker do
     end
 
     it "can sync time on windows hosts" do
-      hosts = make_hosts({ :platform => 'windows' })
+      hosts = make_hosts({ :platform => 'windows-11-64' })
 
       expect(Beaker::Command).to receive(:new).with("w32tm /register").exactly(3).times
       expect(Beaker::Command).to receive(:new).with("net start w32time").exactly(3).times
@@ -184,8 +164,8 @@ describe Beaker do
       subject.timesync(hosts, options)
     end
 
-    it "can set time server on unix hosts" do
-      hosts = make_hosts({ :platform => 'unix' })
+    it "can set time server on el-7 hosts" do
+      hosts = make_hosts({ :platform => 'el-7-64' })
 
       expect(Beaker::Command).to receive(:new).with("ntpdate -u -t 20 #{ntpserver_set}").exactly(3).times
 
@@ -193,7 +173,7 @@ describe Beaker do
     end
 
     it "can set time server on windows hosts" do
-      hosts = make_hosts({ :platform => 'windows' })
+      hosts = make_hosts({ :platform => 'windows-11-64' })
 
       expect(Beaker::Command).to receive(:new).with("w32tm /register").exactly(3).times
       expect(Beaker::Command).to receive(:new).with("net start w32time").exactly(3).times
@@ -225,7 +205,7 @@ describe Beaker do
     subject { dummy_class.new }
 
     it "can perform apt-get on ubuntu hosts" do
-      host = make_host('testhost', { :platform => 'ubuntu' })
+      host = make_host('testhost', { :platform => 'ubuntu-2204-64' })
 
       expect(Beaker::Command).to receive(:new).with("apt-get update -qq").once
 
@@ -233,7 +213,7 @@ describe Beaker do
     end
 
     it "can perform apt-get on debian hosts" do
-      host = make_host('testhost', { :platform => 'debian' })
+      host = make_host('testhost', { :platform => 'debian-12-64' })
 
       expect(Beaker::Command).to receive(:new).with("apt-get update -qq").once
 
@@ -241,7 +221,7 @@ describe Beaker do
     end
 
     it "does nothing on non debian/ubuntu hosts" do
-      host = make_host('testhost', { :platform => 'windows' })
+      host = make_host('testhost', { :platform => 'windows-11-64' })
 
       expect(Beaker::Command).not_to receive(:new)
 
@@ -256,7 +236,7 @@ describe Beaker do
       content = "this is the content"
       tempfilepath = "/path/to/tempfile"
       filepath = "/path/to/file"
-      host = make_host('testhost', { :platform => 'windows' })
+      host = make_host('testhost', { :platform => 'windows-11-64' })
       tempfile = double('tempfile')
       allow(tempfile).to receive(:path).and_return(tempfilepath)
       allow(Tempfile).to receive(:open).and_yield(tempfile)
@@ -274,112 +254,101 @@ describe Beaker do
     subject { dummy_class.new }
 
     it "can sync keys on a solaris host" do
-      @platform = 'solaris'
+      host = make_host('host', { 'platform' => 'solaris-11-64' })
 
-      expect(Beaker::Command).to receive(:new).with(sync_cmd % "bash").exactly(3).times
+      expect(Beaker::Command).to receive(:new).with(sync_cmd % "bash").once
 
-      subject.sync_root_keys(hosts, options)
+      subject.sync_root_keys(host, options)
     end
 
     it "can sync keys on a non-solaris host" do
-      expect(Beaker::Command).to receive(:new).with(sync_cmd % "env PATH=\"/usr/gnu/bin:$PATH\" bash").exactly(3).times
+      host = make_host('host', { 'platform' => 'el-9-64' })
 
-      subject.sync_root_keys(hosts, options)
+      expect(Beaker::Command).to receive(:new).with(sync_cmd % "env PATH=\"/usr/gnu/bin:$PATH\" bash").once
+
+      subject.sync_root_keys(host, options)
     end
   end
 
   context "validate_host" do
     subject { dummy_class.new }
 
-    it "can validate unix hosts" do
-      hosts.each do |host|
-        unix_only_pkgs.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
+    it "can validate el-9 hosts" do
+      host = make_host('host', { :platform => 'el-9-64' })
+
+      ['curl-minimal', 'iputils'].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
 
-      subject.validate_host(hosts, options)
+      subject.validate_host(host, options)
     end
 
     it "can validate windows hosts" do
-      @platform = 'windows'
-
-      hosts.each do |host|
-        windows_pkgs.each do |pkg|
-          allow(host).to receive(:cygwin_installed?).and_return(true)
-          allow(host).to receive(:is_cygwin?).and_return(true)
-          expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
-          expect(host).to receive(:install_package).with(pkg).once
-        end
+      host = make_host('host', { :platform => 'windows-11-64', :is_cygwin => true })
+      allow(host).to receive(:cygwin_installed?).and_return(true)
+
+      ['curl'].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
 
-      subject.validate_host(hosts, options)
+      subject.validate_host(host, options)
     end
 
     it "can validate SLES hosts" do
-      @platform = 'sles-13.1-x64'
+      host = make_host('host', { :platform => 'sles-13.1-x86_64' })
 
-      hosts.each do |host|
-        sles_only_pkgs.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
+      ['curl'].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
 
-      subject.validate_host(hosts, options)
+      subject.validate_host(host, options)
     end
 
     it "can validate opensuse hosts" do
-      @platform = 'opensuse-15-x86_x64'
+      host = make_host('host', { :platform => 'opensuse-15-x86_x64' })
 
-      hosts.each do |host|
-        sles_only_pkgs.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
+      ['curl'].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
 
-      subject.validate_host(hosts, options)
+      subject.validate_host(host, options)
     end
 
     it "can validate RHEL8 hosts" do
-      @platform = 'el-8-x86_x64'
+      host = make_host('host', { :platform => 'el-8-64' })
 
-      hosts.each do |host|
-        rhel8_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
+      ['curl-minimal', 'iputils'].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
 
-      subject.validate_host(hosts, options)
+      subject.validate_host(host, options)
     end
 
     it "can validate Fedora hosts" do
-      @platform = 'fedora-32-x86_64'
+      host = make_host('host', { :platform => 'fedora-32-x86_64' })
 
-      hosts.each do |host|
-        fedora_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
+      ['curl-minimal', 'iputils'].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
 
-      subject.validate_host(hosts, options)
+      subject.validate_host(host, options)
     end
 
     it "can validate Amazon hosts" do
-      @platform = 'amazon-2023-x86_64'
+      host = make_host('host', { :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
+      ['curl-minimal', 'iputils'].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
 
-      subject.validate_host(hosts, options)
+      subject.validate_host(host, options)
     end
   end
 
@@ -388,6 +357,11 @@ describe Beaker do
 
     shared_examples 'find domain name' do
       it "finds the domain name" do
+        cmd = instance_double(Beaker::Command)
+        expect(Beaker::Command).to receive(:new).with(cat).once.and_return(cmd)
+        result = instance_double(Beaker::Result)
+        expect(host).to receive(:exec).with(cmd).and_return(result)
+        expect(result).to receive(:stdout).and_return(stdout)
         expect(subject.get_domain_name(host)).to be === "labs.lan"
       end
     end
@@ -395,45 +369,32 @@ describe Beaker do
     context "on windows" do
       let(:host) do
         make_host('name', {
-                    :platform => 'windows',
+                    :platform => 'windows-11-64',
                     :is_cygwin => cygwin,
-                    :stdout => "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11",
                   })
       end
 
+      let(:stdout) { "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
+
       context "with cygwin" do
         let(:cygwin) { true }
-
-        before do
-          expect(Beaker::Command).to receive(:new).with("cat /cygdrive/c/Windows/System32/drivers/etc/hosts").once
-        end
+        let(:cat) { "cat /cygdrive/c/Windows/System32/drivers/etc/hosts" }
 
         include_examples 'find domain name'
       end
 
       context "without cygwin" do
         let(:cygwin) { false }
-
-        before do
-          expect(Beaker::Command).to receive(:new).with('type C:\Windows\System32\drivers\etc\hosts').once
-        end
+        let(:cat) { 'type C:\Windows\System32\drivers\etc\hosts' }
 
         include_examples 'find domain name'
       end
     end
 
-    %w[amazon centos redhat].each do |platform|
+    %w[amazon-2023-64 centos-9-64 redhat-9-64].each do |platform|
       context "on platform '#{platform}'" do
-        let(:host) do
-          make_host('name', {
-                      :platform => platform,
-                      :stdout => stdout,
-                    })
-        end
-
-        before do
-          expect(Beaker::Command).to receive(:new).with("cat /etc/resolv.conf").once
-        end
+        let(:host) { make_host('name', { :platform => platform }) }
+        let(:cat) { "cat /etc/resolv.conf" }
 
         context "with a domain entry" do
           let(:stdout) { "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
@@ -480,7 +441,7 @@ describe Beaker do
     subject { dummy_class.new }
 
     it "can copy ssh to root in windows hosts with no cygwin" do
-      host = make_host('testhost', { :platform => 'windows', :is_cygwin => false })
+      host = make_host('testhost', { :platform => 'windows-11-64', :is_cygwin => false })
       expect(Beaker::Command).to receive(:new).with("if exist .ssh (xcopy .ssh C:\\Users\\Administrator\\.ssh /s /e /y /i)").once
 
       subject.copy_ssh_to_root(host, options)
@@ -493,7 +454,7 @@ describe Beaker do
     proxyurl = "http://192.168.2.100:3128"
 
     it "can set proxy config on a debian/ubuntu host" do
-      host = make_host('name', { :platform => 'debian' })
+      host = make_host('name', { :platform => 'debian-12-64' })
 
       expect(Beaker::Command).to receive(:new).with("echo 'Acquire::http::Proxy \"#{proxyurl}/\";' >> /etc/apt/apt.conf.d/10proxy").once
       expect(host).to receive(:exec).once
@@ -501,7 +462,7 @@ describe Beaker do
       subject.package_proxy(host, options.merge({ 'package_proxy' => proxyurl }))
     end
 
-    %w[amazon centos redhat].each do |platform|
+    %w[amazon-2023-64 el-9-64].each do |platform|
       it "can set proxy config on a '#{platform}' host" do
         host = make_host('name', { :platform => platform })
 
@@ -517,43 +478,43 @@ describe Beaker do
     subject { dummy_class.new }
 
     it "sets user ssh environment on an OS X 10.10 host" do
-      test_host_ssh_calls('osx-10.10')
+      test_host_ssh_calls('osx-10.10-64')
     end
 
     it "sets user ssh environment on an OS X 10.11 host" do
-      test_host_ssh_calls('osx-10.11')
+      test_host_ssh_calls('osx-10.11-64')
     end
 
     it "sets user ssh environment on an OS X 10.12 host" do
-      test_host_ssh_calls('osx-10.12')
+      test_host_ssh_calls('osx-10.12-64')
     end
 
     it "sets user ssh environment on an OS X 10.13 host" do
-      test_host_ssh_calls('osx-10.13')
+      test_host_ssh_calls('osx-10.13-64')
     end
 
     it "sets user ssh environment on an ssh-based linux host" do
-      test_host_ssh_calls('ubuntu')
+      test_host_ssh_calls('ubuntu-2204-64')
     end
 
     it "sets user ssh environment on an sles host" do
-      test_host_ssh_calls('sles')
+      test_host_ssh_calls('sles-15-64')
     end
 
     it "sets user ssh environment on a solaris host" do
-      test_host_ssh_calls('solaris')
+      test_host_ssh_calls('solaris-11-64')
     end
 
     it "sets user ssh environment on an aix host" do
-      test_host_ssh_calls('aix')
+      test_host_ssh_calls('aix-7.2-power')
     end
 
     it "sets user ssh environment on a FreeBSD host" do
-      test_host_ssh_calls('freebsd')
+      test_host_ssh_calls('freebsd-14-64')
     end
 
     it "sets user ssh environment on a windows host" do
-      test_host_ssh_calls('windows')
+      test_host_ssh_calls('windows-11-64')
     end
 
     def test_host_ssh_calls(platform_name)

data/spec/beaker/host_spec.rb

@@ -7,7 +7,7 @@ module Beaker
     let(:host)    { make_host('name', options.merge(platform)) }
 
     it 'creates a windows host given a windows config' do
-      @platform = 'windows'
+      @platform = 'windows-11-64'
       expect(host).to be_a Windows::Host
     end
 
@@ -109,16 +109,16 @@ module Beaker
         result.exit_code = 0
         expect(Beaker::Command).to receive(:new).with(/grep \^key= ~\/\.ssh\/environment/)
         expect(host).to receive(:exec).and_return(result)
-        expect(Beaker::SedCommand).to receive(:new).with('unix', 's/^key=/key=\\/my\\/first\\/value:/', '~/.ssh/environment')
+        expect(Beaker::SedCommand).to receive(:new).with('el-9-64', 's/^key=/key=\\/my\\/first\\/value:/', '~/.ssh/environment')
         host.add_env_var('key', '/my/first/value')
       end
     end
 
     describe "#delete_env_var" do
       it "deletes env var" do
-        expect(Beaker::SedCommand).to receive(:new).with('unix', '/key=\\/my\\/first\\/value$/d', '~/.ssh/environment')
-        expect(Beaker::SedCommand).to receive(:new).with("unix", "s/key=\\(.*\\)[;:]\\/my\\/first\\/value/key=\\1/", "~/.ssh/environment")
-        expect(Beaker::SedCommand).to receive(:new).with("unix", "s/key=\\/my\\/first\\/value[;:]/key=/", "~/.ssh/environment")
+        expect(Beaker::SedCommand).to receive(:new).with('el-9-64', '/key=\\/my\\/first\\/value$/d', '~/.ssh/environment')
+        expect(Beaker::SedCommand).to receive(:new).with("el-9-64", "s/key=\\(.*\\)[;:]\\/my\\/first\\/value/key=\\1/", "~/.ssh/environment")
+        expect(Beaker::SedCommand).to receive(:new).with("el-9-64", "s/key=\\/my\\/first\\/value[;:]/key=/", "~/.ssh/environment")
         host.delete_env_var('key', '/my/first/value')
       end
     end
@@ -250,7 +250,7 @@ module Beaker
     describe "#mkdir_p" do
       it "does the right thing on a bash host, identified as is_cygwin=true" do
         @options = { :is_cygwin => true }
-        @platform = 'windows'
+        @platform = 'windows-11-64'
         result = double
         allow(result).to receive(:exit_code).and_return(0)
         allow(host).to receive(:exec).and_return(result)
@@ -261,7 +261,7 @@ module Beaker
 
       it "does the right thing on a bash host, identified as is_cygwin=nil" do
         @options = { :is_cygwin => nil }
-        @platform = 'windows'
+        @platform = 'windows-11-64'
         result = double
         allow(result).to receive(:exit_code).and_return(0)
         allow(host).to receive(:exec).and_return(result)
@@ -272,7 +272,7 @@ module Beaker
 
       it "does the right thing on a non-bash host, identified as is_cygwin=false (powershell)" do
         @options = { :is_cygwin => false }
-        @platform = 'windows'
+        @platform = 'windows-11-64'
         result = double
         allow(result).to receive(:exit_code).and_return(0)
         allow(host).to receive(:exec).and_return(result)
@@ -290,19 +290,17 @@ module Beaker
 
     describe "#touch" do
       it "generates the right absolute command for a windows host" do
-        @platform = 'windows'
+        @platform = 'windows-11-64'
         expect(host.touch('touched_file')).to eq "c:\\\\windows\\\\system32\\\\cmd.exe /c echo. 2> touched_file"
       end
 
-      %w[centos redhat].each do |platform|
-        it "generates the right absolute command for a #{platform} host" do
-          @platform = platform
-          expect(host.touch('touched_file')).to eq "/bin/touch touched_file"
-        end
+      it "generates the right absolute command for an el-9-64 host" do
+        @platform = 'el-9-64'
+        expect(host.touch('touched_file')).to eq "/bin/touch touched_file"
       end
 
-      it "generates the right absolute command for an osx host" do
-        @platform = 'osx'
+      it "generates the right absolute command for an osx-12-64 host" do
+        @platform = 'osx-12-64'
         expect(host.touch('touched_file')).to eq "/usr/bin/touch touched_file"
       end
     end
@@ -762,12 +760,12 @@ module Beaker
 
     describe "#fips_mode?" do
       it 'returns false on non-linux hosts' do
-        @platform = 'windows'
+        @platform = 'windows-11-64'
         expect(host).to receive(:file_exist?).with('/proc/sys/crypto/fips_enabled').and_return(false)
         expect(host.fips_mode?).to be false
       end
 
-      platforms = %w[el-7 el-8 centos]
+      platforms = %w[el-7-64 el-8-64 centos-9-64]
 
       platforms.each do |platform|
         context "on #{platform}" do

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Beaker
   describe Hypervisor do
-    let(:hosts) { make_hosts({ :platform => 'el-5' }) }
+    let(:hosts) { make_hosts({ :platform => 'el-9-64' }) }
 
     describe "#create" do
       let(:hypervisor) { described_class }

data/spec/beaker/perf_spec.rb

@@ -25,32 +25,34 @@ module Beaker
       end
 
       it 'creates a new Perf object with a single host' do
-        hosts = [make_host("myHost", @options)]
-        hosts.each { |host| host['platform'] = "centos-6-x86_64" }
+        hosts = [make_host("myHost", @options.merge('platform' => 'centos-6-64'))]
         @my_logger.remove_destination(STDOUT)
         perf = described_class.new(hosts, @options)
         expect(perf).to be_a described_class
-        expect(@my_io.string).to match(/Setup perf on host: myHost/)
+        expect(@my_io.string).to eq("Setup perf on host: myHost\n")
       end
 
       it 'creates a new Perf object with multiple hosts' do
-        hosts = [make_host("myHost", @options), make_host("myOtherHost", @options)]
-        hosts.each { |host| host['platform'] = "centos-6-x86_64" }
+        hosts = [
+          make_host("myHost", @options.merge('platform' => 'centos-6-64')),
+          make_host("myOtherHost", @options.merge('platform' => 'centos-6-64')),
+        ]
         @my_logger.remove_destination(STDOUT)
         perf = described_class.new(hosts, @options)
         expect(perf).to be_a described_class
-        expect(@my_io.string).to match(/Setup perf on host: myHost*\nSetup perf on host: myOtherHost/)
+        expect(@my_io.string).to eq("Setup perf on host: myHost\nSetup perf on host: myOtherHost\n")
       end
 
       it 'creates a new Perf object with multiple hosts, SLES' do
-        hosts = [make_host("myHost", @options), make_host("myOtherHost", @options), make_host("myThirdHost", @options)]
-        hosts[0]['platform'] = "centos-6-x86_64"
-        hosts[1]['platform'] = "sles-11-x86_64"
-        hosts[2]['platform'] = "opensuse-15-x86_64"
+        hosts = [
+          make_host("myHost", @options.merge('platform' => 'centos-6-64')),
+          make_host("myOtherHost", @options.merge('platform' => 'sles-11-64')),
+          make_host("myThirdHost", @options.merge('platform' => 'opensuse-15-64')),
+        ]
         @my_logger.remove_destination(STDOUT)
         perf = described_class.new(hosts, @options)
         expect(perf).to be_a described_class
-        expect(@my_io.string).to match(/Setup perf on host: myHost\nSetup perf on host: myOtherHost/)
+        expect(@my_io.string).to include("Setup perf on host: myHost\nSetup perf on host: myOtherHost\n")
       end
     end
 
@@ -60,7 +62,6 @@ module Beaker
         @options[:collect_perf_data] = 'normal'
         @options[:log_level] = :debug
         @options[:color] = false
-        @hosts = [make_host("myHost", @options), make_host("myOtherHost", @options)]
         @my_io = StringIO.new
         @my_logger = Beaker::Logger.new(@options)
         @my_logger.add_destination(@my_io)
@@ -68,21 +69,24 @@ module Beaker
       end
 
       it "Does the Right Thing on Linux hosts" do
-        @hosts[0]['platform'] = "centos-6-x86_64"
+        hosts = [make_host("myHost", @options.merge('platform' => 'centos-6-64'))]
         @my_logger.remove_destination(STDOUT)
-        perf = described_class.new(@hosts, @options)
+        perf = described_class.new(hosts, @options)
         expect(perf).to be_a described_class
         perf.print_perf_info
-        expect(@my_io.string).to match(/Setup perf on host: myHost\nSetup perf on host: myOtherHost\nPerf \(sysstat\) not supported on host: myOtherHost\nGetting perf data for host: myHost\nGetting perf data for host: myOtherHost\nPerf \(sysstat\) not supported on host: myOtherHost/)
+        expect(@my_io.string).to eq("Setup perf on host: myHost\nGetting perf data for host: myHost\n")
       end
 
       it "Does the Right Thing on non-Linux hosts" do
-        @hosts[0]['platform'] = "windows"
+        hosts = [
+          make_host("myHost", @options.merge('platform' => 'windows-11-64')),
+          make_host("myOtherHost", @options.merge('platform' => 'solaris-11-64')),
+        ]
         @my_logger.remove_destination(STDOUT)
-        perf = described_class.new(@hosts, @options)
+        perf = described_class.new(hosts, @options)
         expect(perf).to be_a described_class
         perf.print_perf_info
-        expect(@my_io.string).to match(/Setup perf on host: myHost\nPerf \(sysstat\) not supported on host: myHost\nSetup perf on host: myOtherHost\nPerf \(sysstat\) not supported on host: myOtherHost\nGetting perf data for host: myHost\nPerf \(sysstat\) not supported on host: myHost\nGetting perf data for host: myOtherHost\nPerf \(sysstat\) not supported on host: myOtherHost/)
+        expect(@my_io.string).to eq("Setup perf on host: myHost\nPerf (sysstat) not supported on host: myHost\nSetup perf on host: myOtherHost\nPerf (sysstat) not supported on host: myOtherHost\nGetting perf data for host: myHost\nPerf (sysstat) not supported on host: myHost\nGetting perf data for host: myOtherHost\nPerf (sysstat) not supported on host: myOtherHost\n")
       end
     end
   end

data/spec/beaker/shared/host_manager_spec.rb

@@ -11,7 +11,7 @@ module Beaker
       let(:logger)         { double('logger') }
       let(:host_handler)   { described_class }
       let(:spec_block)     { Proc.new { |arr| arr } }
-      let(:platform)       { @platform || 'unix' }
+      let(:platform)       { @platform || 'el-9-64' }
       let(:role0)          { "role0" }
       let(:role1)          { :role1 }
       let(:role2)          { :role2 }

data/spec/helpers.rb

@@ -24,7 +24,7 @@ module TestFileHelpers
 end
 
 module HostHelpers
-  HOST_DEFAULTS = { :platform => 'unix',
+  HOST_DEFAULTS = { :platform => 'el-9-64',
                     :roles => ['agent'],
                     :snapshot => 'snap',
                     :ip => 'default.ip.address',
@@ -91,6 +91,8 @@ module HostHelpers
   def make_host name, host_hash
     host_hash = Beaker::Options::OptionsHash.new.merge(HOST_DEFAULTS.merge(host_hash))
 
+    host_hash['platform'] = Beaker::Platform.new(host_hash['platform']) unless host_hash['platform'].is_a?(Beaker::Platform)
+
     host = Beaker::Host.create(name, host_hash, make_opts)
 
     allow(host).to receive(:exec).and_return(generate_result(name, host_hash))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-03 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement