beaker 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd2ad07fea03a806838c759f62a7d8012f47da31b9e408d8caf5eae018a7353
-  data.tar.gz: ef99fa2273d9ed94a4fa5ccb9f6b43157e270e2cd72d685ce08016a14b8ba5b6
+  metadata.gz: 4bd64151b4d7038041d90e11963d3cf10ebef210df726cf0732904d991f9307b
+  data.tar.gz: 90952c9a755e89c4c9a2df207f71829152ed2a1824b481df0daa1d9695563d82
 SHA512:
-  metadata.gz: 4ef30fb6d9538ec1d4cc2644e0a4231a8788e93f36a657205ec5f11b030462fa1bf429a6dead72db0a98118928f51dd610c675489b8a7f0a0955ed2aa7c645f6
-  data.tar.gz: 443b0624611e79c3d3a4bb3f10148bee8b2a9a96d0a01364f2b62399a288bee5f05364bdfb33b31a9064b5bcd893bf918867f4063817c63487cfbb58bf672250
+  metadata.gz: b6962dadc9e45225e1f861c171a02031bf7d1a76cfc50933b850f874d50b652105d380aed5b68ee0c4ce28318d631ef0a2c32bd89e96653afa93224b9592a3e5
+  data.tar.gz: 34b7603729a023b0549a693c06269a2fc8d953179ed6a03a691083d30b2eaee5ac7bbbc45a27844d02c788cb2849b8612b1d57c4caacc9c13ee077031c2a9123

data/.rubocop_todo.yml

@@ -199,7 +199,7 @@ RSpec/MultipleDescribes:
 # Offense count: 134
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 17
+  Max: 18
 
 # Offense count: 500
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [5.5.0](https://github.com/voxpupuli/beaker/tree/5.5.0) (2023-10-02)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/5.4.0...5.5.0)
+
+**Implemented enhancements:**
+
+- Allow amazon as a platform [\#1824](https://github.com/voxpupuli/beaker/pull/1824) ([yachub](https://github.com/yachub))
+
 ## [5.4.0](https://github.com/voxpupuli/beaker/tree/5.4.0) (2023-09-12)
 
 [Full Changelog](https://github.com/voxpupuli/beaker/compare/5.3.0...5.4.0)

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|centos|redhat|oracle|scientific)-[7-9]|eos-7|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
+    when /amazon|(el|centos|redhat|oracle|scientific)-[7-9]|eos-7|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,7 +302,7 @@ 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/
+    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"))

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/'
@@ -149,7 +149,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 }
@@ -87,7 +87,7 @@ module Unix::Pkg
       execute("zypper --non-interactive --gpg-auto-import-keys in #{name}", opts)
     when /el-4/
       @logger.debug("Package installation not supported on rhel4")
-    when /fedora-(2[2-9]|3[0-9])/
+    when /amazon|fedora-(2[2-9]|3[0-9])/
       name = "#{name}-#{version}" if version
       execute("dnf -y #{cmdline_args} install #{name}", opts)
     when /cisco|fedora|centos|redhat|eos|el-/
@@ -172,7 +172,7 @@ module Unix::Pkg
       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])/
+    when /amazon|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)
@@ -264,9 +264,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}")
@@ -294,7 +294,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

@@ -10,6 +10,7 @@ module Beaker
     NTPSERVER = 'pool.ntp.org'
     SLEEPWAIT = 5
     TRIES = 5
+    AMAZON2023_PACKAGES = %w[curl-minimal chrony]
     RHEL8_PACKAGES = %w[curl chrony]
     RHEL9_PACKAGES = ['chrony']
     FEDORA_PACKAGES = %w[curl chrony]
@@ -49,7 +50,7 @@ module Beaker
           host.exec(Command.new("w32tm /resync"))
           logger.notify "NTP date succeeded on #{host}"
         else
-          if /el-[89]|fedora/.match?(host['platform'])
+          if /amazon|el-[89]|fedora/.match?(host['platform'])
             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}"
@@ -108,6 +109,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/
@@ -387,7 +390,7 @@ module Beaker
         # 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'])
+        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 })
@@ -431,7 +434,7 @@ module Beaker
         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/
+        when /amazon/, /^el-/, /centos/, /fedora/, /redhat/, /eos/
           host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
         when /solaris-11/
           host.exec(Command.new("/usr/bin/pkg unset-publisher solaris || :"))

data/lib/beaker/perf.rb

@@ -3,8 +3,8 @@ module Beaker
   class Perf
     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
@@ -47,7 +47,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,7 +3,9 @@ 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)\-.+\-.+$/
+    # rubocop:disable Layout/LineLength
+    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)\-.+\-.+$/
+    # rubocop:enable Layout/LineLength
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
       { :debian => { "forky" => "14",
@@ -56,6 +58,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/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '5.4.0'
+    STRING = '5.5.0'
   end
 end

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

@@ -33,7 +33,7 @@ module Beaker
     let(:instance) { UnixFileTest.new(opts.merge(platform), logger) }
 
     describe '#repo_type' do
-      %w[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'
@@ -54,7 +54,7 @@ module Beaker
     end
 
     describe '#package_config_dir' do
-      %w[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

@@ -58,7 +58,7 @@ module Beaker
         expect(instance.check_for_package(pkg)).to be === true
       end
 
-      %w[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"
@@ -195,6 +195,14 @@ 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("dnf -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' }
         pkg = 'archlinux_package'
@@ -291,6 +299,14 @@ module Beaker
         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
         (22...39).each do |version|
           @version = version

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -11,6 +11,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 }
@@ -85,6 +86,11 @@ 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
 
+  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\"",
@@ -147,6 +153,15 @@ describe Beaker do
       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
       hosts = make_hosts(:platform => 'el-8-x86_x64')
       expect(Beaker::Command).to receive(:new)
@@ -358,6 +373,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
@@ -404,7 +432,7 @@ describe Beaker do
       end
     end
 
-    %w[centos redhat].each do |platform|
+    %w[amazon centos redhat].each do |platform|
       context "on platform '#{platform}'" do
         let(:host) do
           make_host('name', {
@@ -483,7 +511,7 @@ describe Beaker do
       subject.package_proxy(host, options.merge({ 'package_proxy' => proxyurl }))
     end
 
-    %w[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/helpers.rb

@@ -127,7 +127,8 @@ module PlatformHelpers
 
   FEDORASYSTEMD    = (14..39).to_a.collect! { |i| "fedora-#{i}" }
 
-  SYSTEMDPLATFORMS = %w[el-7
+  SYSTEMDPLATFORMS = %w[amazon-2023
+                        el-7
                         centos-7
                         redhat-7
                         oracle-7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs