beaker 4.33.0 → 4.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 616dad30c0a52596729122a76480319c8de41481e0db2eda6a8928d749753ebc
-  data.tar.gz: b2576fdfc69863c773cf6f1bf4680abdf37ff9dcec1d1181197b63a5ddcbb480
+  metadata.gz: bc022311d195fb3d0b0ff1b9b957272379e6adc5aadb1dfb30e77d89a912872d
+  data.tar.gz: be60dbf2c333ea695d3e6d8b4b8fd5dc6811acbe6489e17cf924b08f24c79b05
 SHA512:
-  metadata.gz: 4275553bc11bdf88c2d61362ef90b7ae4ebbf4d9edefa7dd425047749b15c71c66d793c9f1cdc6177aa1f8ccbddeb7753415cc20095ca561825c1731cf4130e8
-  data.tar.gz: 3c84ade543f27139069dd163634a0bd531a22f8c9c397450f32d102d609ebd2023e1c89dea7074a00da05d5bd8f95965c5f1895c69d845942ef7b4bcc2ca81a2
+  metadata.gz: '0287d90c4f88b325f104eb4dd36ad8d75f26f070c2851d4bec00c364ee3150fc706902667ecd14f1e127cd5e4030d8a418ce0dccbe9a6ec9f58dbdd08a81a1de'
+  data.tar.gz: 8db6cc489d03e57bf25f373cd20dbc1c99b3d1eebbd7108191bd133e3152f61b8333a8f24667f7ed24c29ba4f29242bfaa5c016c24d380a11c24cb0c3207d942

data/CHANGELOG.md

@@ -1,10 +1,22 @@
 # Changelog
 
+## [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/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/platform.rb

@@ -130,14 +130,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.34.0'
   end
 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/platform_spec.rb

@@ -145,7 +145,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.33.0
+  version: 4.34.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec