beaker 4.41.2 → 5.0.0

data/lib/beaker/host_prebuilt_steps.rb

@@ -1,42 +1,37 @@
-require 'pathname'
-
-[ 'command', "dsl" ].each do |lib|
+%w[command dsl].each do |lib|
   require "beaker/#{lib}"
 end
 
 module Beaker
-  #Provides convienience methods for commonly run actions on hosts
+  # Provides convienience methods for commonly run actions on hosts
   module HostPrebuiltSteps
     include Beaker::DSL::Patterns
 
     NTPSERVER = 'pool.ntp.org'
     SLEEPWAIT = 5
     TRIES = 5
-    AMAZON2023_PACKAGES = %w[curl-minimal chrony]
     RHEL8_PACKAGES = %w[curl chrony]
     RHEL9_PACKAGES = ['chrony']
-    FEDORA_PACKAGES = ['curl', 'chrony']
-    UNIX_PACKAGES = ['curl', 'ntpdate']
+    FEDORA_PACKAGES = %w[curl chrony]
+    UNIX_PACKAGES = %w[curl ntpdate]
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
-    ARCHLINUX_PACKAGES = ['curl', 'ntp', 'net-tools', 'openssh']
+    ARCHLINUX_PACKAGES = %w[curl ntp net-tools openssh]
     WINDOWS_PACKAGES = ['curl']
     PSWINDOWS_PACKAGES = []
     SLES10_PACKAGES = ['curl']
-    SLES_PACKAGES = ['curl', 'ntp']
-    DEBIAN_PACKAGES = ['curl', 'ntpdate', 'lsb-release', 'apt-transport-https']
-    CUMULUS_PACKAGES = ['curl', 'ntpdate']
-    SOLARIS10_PACKAGES = ['CSWcurl', 'CSWntp', 'wget']
-    SOLARIS11_PACKAGES = ['curl', 'ntp']
+    SLES_PACKAGES = %w[curl ntp]
+    DEBIAN_PACKAGES = %w[curl ntpdate lsb-release apt-transport-https]
+    CUMULUS_PACKAGES = %w[curl ntpdate]
+    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"
     ROOT_KEYS_SYNC_CMD = "curl -k -o - -L #{ROOT_KEYS_SCRIPT} | %s"
     ROOT_KEYS_SYNC_CMD_AIX = "curl --tlsv1 -o - -L #{ROOT_KEYS_SCRIPT} | %s"
-    APT_CFG = %q{ Acquire::http::Proxy "http://proxy.puppetlabs.net:3128/"; }
-    IPS_PKG_REPO="http://solaris-11-internal-repo.delivery.puppetlabs.net"
 
-    #Run timesync on the provided hosts
+    # Run timesync on the provided hosts
     # @param [Host, Array<Host>] 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
@@ -48,38 +43,36 @@ module Beaker
         if host['platform'].include? 'windows'
           # The exit code of 5 is for Windows 2008 systems where the w32tm /register command
           # is not actually necessary.
-          host.exec(Command.new("w32tm /register"), :acceptable_exit_codes => [0,5])
-          host.exec(Command.new("net start w32time"), :acceptable_exit_codes => [0,2])
+          host.exec(Command.new("w32tm /register"), :acceptable_exit_codes => [0, 5])
+          host.exec(Command.new("net start w32time"), :acceptable_exit_codes => [0, 2])
           host.exec(Command.new("w32tm /config /manualpeerlist:#{ntp_server} /syncfromflags:manual /update"))
           host.exec(Command.new("w32tm /resync"))
           logger.notify "NTP date succeeded on #{host}"
         else
-          case
-          when /amazon|el-[89]|fedora/.match?(host['platform'])
+          if /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'])
+          elsif /opensuse-|sles-/.match?(host['platform'])
             ntp_command = "sntp #{ntp_server}"
-          when host['platform'].include?('cisco_nexus')
+          elsif host['platform'].include?('cisco_nexus')
             ntp_server = host.exec(Command.new("getent hosts #{NTPSERVER} | head -n1 |cut -d \" \" -f1"), :acceptable_exit_codes => [0]).stdout
             ntp_command = "sudo -E sh -c 'export DCOS_CONTEXT=2;/isan/bin/ntpdate -u -t 20 #{ntp_server}'"
           else
             ntp_command = "ntpdate -u -t 20 #{ntp_server}"
           end
-          success=false
+          success = false
           try = 0
-          until try >= TRIES do
+          until try >= TRIES
             try += 1
             if host.exec(Command.new(ntp_command), :accept_all_exit_codes => true).exit_code == 0
-              success=true
+              success = true
               break
             end
             sleep SLEEPWAIT
           end
-          if success
-            logger.notify "NTP date succeeded on #{host} after #{try} tries"
-          else
-            raise "NTP date was not successful after #{try} tries"
-          end
+          raise "NTP date was not successful after #{try} tries" unless success
+
+          logger.notify "NTP date succeeded on #{host} after #{try} tries"
+
         end
       end
       nil
@@ -115,8 +108,6 @@ 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/
@@ -132,6 +123,7 @@ module Beaker
       when /windows/
         if host.is_cygwin?
           raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
+
           WINDOWS_PACKAGES
         else
           PSWINDOWS_PACKAGES
@@ -165,6 +157,7 @@ module Beaker
       package_list.each do |string|
         alternatives = string.split('|')
         next if alternatives.any? { |pkg| host.check_for_package pkg }
+
         install_one_of_packages host, alternatives
       end
     end
@@ -185,9 +178,9 @@ module Beaker
       raise error
     end
 
-    #Install a set of authorized keys using {HostPrebuiltSteps::ROOT_KEYS_SCRIPT}.  This is a
-    #convenience method to allow for easy login to hosts after they have been provisioned with
-    #Beaker.
+    # Install a set of authorized keys using {HostPrebuiltSteps::ROOT_KEYS_SCRIPT}.  This is a
+    # convenience method to allow for easy login to hosts after they have been provisioned with
+    # Beaker.
     # @param [Host, Array<Host>] 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
@@ -198,7 +191,7 @@ module Beaker
       # when reality dictates otherwise"
       logger = opts[:logger]
       block_on host do |host|
-      logger.notify "Sync root authorized_keys from github on #{host.name}"
+        logger.notify "Sync root authorized_keys from github on #{host.name}"
         # Allow all exit code, as this operation is unlikely to cause problems if it fails.
         if /solaris|eos/.match?(host['platform'])
           host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "bash"), :accept_all_exit_codes => true)
@@ -218,124 +211,54 @@ module Beaker
     # @param [Host, Array<Host>] hosts One or more hosts to act upon
     def apt_get_update hosts
       block_on hosts do |host|
-        if /ubuntu|debian|cumulus/.match?(host[:platform])
-          host.exec(Command.new("apt-get update"))
-        end
+        host.exec(Command.new("apt-get update")) if /ubuntu|debian|cumulus/.match?(host[:platform])
       end
     end
 
-    #Create a file on host or hosts at the provided file path with the provided file contents.
+    # Create a file on host or hosts at the provided file path with the provided file contents.
     # @param [Host, Array<Host>] host One or more hosts to act upon
     # @param [String] file_path The path at which the new file will be created on the host or hosts.
     # @param [String] file_content The contents of the file to be created on the host or hosts.
     def copy_file_to_remote(host, file_path, file_content)
       block_on host do |host|
         Tempfile.open 'beaker' do |tempfile|
-          File.open(tempfile.path, 'w') {|file| file.puts file_content }
+          File.open(tempfile.path, 'w') { |file| file.puts file_content }
 
           host.do_scp_to(tempfile.path, file_path, @options)
         end
       end
     end
 
-    # On ubuntu, debian, or cumulus host or hosts: alter apt configuration to use
-    # the internal Puppet Labs proxy {HostPrebuiltSteps::APT_CFG} proxy.
-    # On solaris-11 host or hosts: alter pkg to point to
-    # the internal Puppet Labs proxy {HostPrebuiltSteps::IPS_PKG_REPO}.
-    #
-    # Do nothing for other platform host or hosts.
-    #
-    # @param [Host, Array<Host>] 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
-    def proxy_config( host, opts )
-      logger = opts[:logger]
-      block_on host do |host|
-        case
-        when /ubuntu|debian|cumulus/.match?(host['platform'])
-          host.exec(Command.new("if test -f /etc/apt/apt.conf; then mv /etc/apt/apt.conf /etc/apt/apt.conf.bk; fi"))
-          copy_file_to_remote(host, '/etc/apt/apt.conf', APT_CFG)
-          apt_get_update(host)
-        when host['platform'].include?('solaris-11')
-          host.exec(Command.new("/usr/bin/pkg unset-publisher solaris || :"))
-          host.exec(Command.new("/usr/bin/pkg set-publisher -g %s solaris" % IPS_PKG_REPO))
-        else
-          logger.debug "#{host}: repo proxy configuration not modified"
-        end
-      end
-    rescue => e
-      report_and_raise(logger, e, "proxy_config")
-    end
-
-    #Install EPEL on host or hosts with platform = /el-(6|7)/.  Do nothing on host or hosts of other platforms.
-    # @param [Host, Array<Host>] host One or more hosts to act upon.  Will use individual host epel_url, epel_arch
-    #                                 and epel_pkg before using defaults provided in opts.
-    # @param [Hash{Symbol=>String}] opts Options to alter execution.
-    # @option opts [Boolean] :debug If true, print verbose rpm information when installing EPEL
-    # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
-    # @option opts [String] :epel_url Link to download from
-    def add_el_extras( host, opts )
-      #add_el_extras
-      #only supports el-* platforms
-      logger = opts[:logger]
-      block_on host do |host|
-        case
-        when el_based?(host) && ['6','7'].include?(host['platform'].version)
-          result = host.exec(Command.new('rpm -qa | grep epel-release'), :acceptable_exit_codes => [0,1])
-          if result.exit_code == 1
-            url_base = opts[:epel_url]
-            host.install_package_with_rpm("#{url_base}/epel-release-latest-#{host['platform'].version}.noarch.rpm", '--replacepkgs', { :package_proxy => opts[:package_proxy] })
-            #update /etc/yum.repos.d/epel.repo for new baseurl
-            host.exec(Command.new("sed -i -e 's;#baseurl.*$;baseurl=#{Regexp.escape("#{url_base}/#{host['platform'].version}")}/\$basearch;' /etc/yum.repos.d/epel.repo"))
-            #remove mirrorlist
-            host.exec(Command.new("sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo"))
-            host.exec(Command.new('yum clean all && yum makecache'))
-          end
-        else
-          logger.debug "#{host}: package repo configuration not modified"
-        end
-      end
-    rescue => e
-      report_and_raise(logger, e, "add_repos")
-    end
-
-    #Determine the domain name of the provided host from its /etc/resolv.conf
+    # Determine the domain name of the provided host from its /etc/resolv.conf
     # @param [Host] host the host to act upon
     def get_domain_name(host)
       domain = nil
       search = nil
-      if host['platform'].include?('windows')
-        if host.is_cygwin?
-          resolv_conf = host.exec(Command.new("cat /cygdrive/c/Windows/System32/drivers/etc/hosts")).stdout
-        else
-          resolv_conf = host.exec(Command.new('type C:\Windows\System32\drivers\etc\hosts')).stdout
+      resolv_conf = if host['platform'].include?('windows')
+                      if host.is_cygwin?
+                        host.exec(Command.new("cat /cygdrive/c/Windows/System32/drivers/etc/hosts")).stdout
+                      else
+                        host.exec(Command.new('type C:\Windows\System32\drivers\etc\hosts')).stdout
+                      end
+                    else
+                      host.exec(Command.new("cat /etc/resolv.conf")).stdout
+                    end
+      resolv_conf.each_line do |line|
+        if (match = /^\s*domain\s+(\S+)/.match(line))
+          domain = match[1]
+        elsif (match = /^\s*search\s+(\S+)/.match(line))
+          search = match[1]
         end
-      else
-        resolv_conf = host.exec(Command.new("cat /etc/resolv.conf")).stdout
       end
-      resolv_conf.each_line { |line|
-        if line =~ /^\s*domain\s+(\S+)/
-          domain = $1
-        elsif line =~ /^\s*search\s+(\S+)/
-          search = $1
-        end
-      }
       return_value ||= domain
       return_value ||= search
 
-      if return_value
-        return_value.gsub(/\.$/, '')
-      end
-    end
+      return unless return_value
 
-    #Determine the ip address of the provided host
-    # @param [Host] host the host to act upon
-    # @deprecated use {Host#get_ip}
-    def get_ip(host)
-      host.get_ip
+      return_value.gsub(/\.$/, '')
     end
 
-    #Append the provided string to the /etc/hosts file of the provided host
+    # Append the provided string to the /etc/hosts file of the provided host
     # @param [Host] host the host to act upon
     # @param [String] etc_hosts The string to append to the /etc/hosts file
     def set_etc_hosts(host, etc_hosts)
@@ -347,16 +270,16 @@ module Beaker
         host.exec(Command.new("echo '#{etc_hosts}' >> /etc/hosts"))
       end
       # AIX must be configured to prefer local DNS over external
-      if host['platform'].include?('aix')
-        aix_netsvc = '/etc/netsvc.conf'
-        aix_local_resolv = 'hosts = local, bind'
-        unless host.exec(Command.new("grep '#{aix_local_resolv}' #{aix_netsvc}"), :accept_all_exit_codes => true).exit_code == 0
-          host.exec(Command.new("echo '#{aix_local_resolv}' >> #{aix_netsvc}"))
-        end
-      end
+      return unless host['platform'].include?('aix')
+
+      aix_netsvc = '/etc/netsvc.conf'
+      aix_local_resolv = 'hosts = local, bind'
+      return if host.exec(Command.new("grep '#{aix_local_resolv}' #{aix_netsvc}"), :accept_all_exit_codes => true).exit_code == 0
+
+      host.exec(Command.new("echo '#{aix_local_resolv}' >> #{aix_netsvc}"))
     end
 
-    #Make it possible to log in as root by copying the current users ssh keys to the root account
+    # Make it possible to log in as root by copying the current users ssh keys to the root account
     # @param [Host, Array<Host>] 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
@@ -379,18 +302,16 @@ module Beaker
           #      existing destination file.
           host.exec(Command.new("if exist .ssh (xcopy .ssh C:\\Users\\Administrator\\.ssh /s /e /y /i)"))
         elsif host['platform'].include?('osx')
-          host.exec(Command.new('sudo cp -r .ssh /var/root/.'), {:pty => true})
+          host.exec(Command.new('sudo cp -r .ssh /var/root/.'), { :pty => true })
         elsif /(free|open)bsd/.match?(host['platform']) || host['platform'].include?('solaris-11')
-          host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
+          host.exec(Command.new('sudo cp -r .ssh /root/.'), { :pty => true })
         elsif host['platform'].include?('solaris-10')
-          host.exec(Command.new('sudo cp -r .ssh /.'), {:pty => true})
+          host.exec(Command.new('sudo cp -r .ssh /.'), { :pty => true })
         else
-          host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), {:pty => true})
+          host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), { :pty => true })
         end
 
-        if host.selinux_enabled?
-          host.exec(Command.new('sudo fixfiles restore /root'))
-        end
+        host.exec(Command.new('sudo fixfiles restore /root')) if host.selinux_enabled?
       end
     end
 
@@ -422,6 +343,7 @@ module Beaker
       logger = opts[:logger]
       hosts.each do |host|
         next if host['platform'].include?('netscaler')
+
         logger.notify "Disabling updates.puppetlabs.com by modifying hosts file to resolve updates to 127.0.0.1 on #{host}"
         set_etc_hosts(host, "127.0.0.1\tupdates.puppetlabs.com\n")
       end
@@ -446,40 +368,40 @@ module Beaker
           host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' #{ssh_config_file}"))
           host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' #{ssh_config_file}"))
         elsif host['platform'].include?('freebsd')
-          host.exec(Command.new("sudo sed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
+          host.exec(Command.new("sudo sed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), { :pty => true })
         elsif host['platform'].include?('openbsd')
-          host.exec(Command.new("sudo perl -pi -e 's/^PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config"), {:pty => true} )
+          host.exec(Command.new("sudo perl -pi -e 's/^PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config"), { :pty => true })
         elsif host['platform'].include?('solaris-10')
-          host.exec(Command.new("sudo gsed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
+          host.exec(Command.new("sudo gsed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), { :pty => true })
         elsif host['platform'].include?('solaris-11')
-          host.exec(Command.new("if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"), {:pty => true} )
-          host.exec(Command.new("sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
+          host.exec(Command.new("if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"), { :pty => true })
+          host.exec(Command.new("sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), { :pty => true })
         elsif host['platform'].include?('f5') || host.is_powershell?
-          #interacting with f5 should using tmsh
+          # interacting with f5 should using tmsh
           logger.warn("Attempting to enable root login non-supported platform: #{host.name}: #{host['platform']}")
         elsif host.is_cygwin?
-          host.exec(Command.new("sed -ri 's/^#?PermitRootLogin /PermitRootLogin yes/' /etc/sshd_config"), {:pty => true})
+          host.exec(Command.new("sed -ri 's/^#?PermitRootLogin /PermitRootLogin yes/' /etc/sshd_config"), { :pty => true })
         else
-          host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
+          host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), { :pty => true })
         end
-        #restart sshd
+        # restart sshd
         if /debian|ubuntu|cumulus/.match?(host['platform'])
           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'])
+        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 })
         elsif /centos|el-|redhat|fedora|eos/.match?(host['platform'])
-          host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
+          host.exec(Command.new("sudo -E /sbin/service sshd reload"), { :pty => true })
         elsif /(free|open)bsd/.match?(host['platform'])
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
         elsif host['platform'].include?('solaris')
-          host.exec(Command.new("sudo -E svcadm restart network/ssh"), {:pty => true} )
+          host.exec(Command.new("sudo -E svcadm restart network/ssh"), { :pty => true })
         else
           logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
         end
       end
     end
 
-    #Disable SELinux on centos, does nothing on other platforms
+    # Disable SELinux on centos, does nothing on other platforms
     # @param [Host, Array<Host>] 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
@@ -488,29 +410,13 @@ module Beaker
       block_on host do |host|
         if /centos|el-|redhat|fedora|eos/.match?(host['platform'])
           logger.debug("Disabling se_linux on #{host.name}")
-          host.exec(Command.new("sudo su -c \"setenforce 0\""), {:pty => true})
+          host.exec(Command.new("sudo su -c \"setenforce 0\""), { :pty => true })
         else
           logger.warn("Attempting to disable SELinux on non-supported platform: #{host.name}: #{host['platform']}")
         end
       end
     end
 
-    #Disable iptables on centos, does nothing on other platforms
-    # @param [Host, Array<Host>] 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
-    def disable_iptables host, opts
-      logger = opts[:logger]
-      block_on host do |host|
-        if /centos|el-|redhat|fedora|eos/.match?(host['platform'])
-          logger.debug("Disabling iptables on #{host.name}")
-          host.exec(Command.new("sudo su -c \"/etc/init.d/iptables stop\""), {:pty => true})
-        else
-          logger.warn("Attempting to disable iptables on non-supported platform: #{host.name}: #{host['platform']}")
-        end
-      end
-    end
-
     # Setup files for enabling requests to pass to a proxy server
     # This works for the APT package manager on debian, ubuntu, and cumulus
     # and YUM package manager on el, centos, fedora and redhat.
@@ -525,15 +431,17 @@ 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 /amazon/, /^el-/, /centos/, /fedora/, /redhat/, /eos/
+        when /^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 || :"))
+          host.exec(Command.new("/usr/bin/pkg set-publisher -g %s solaris" % opts[:package_proxy]))
         else
           logger.debug("Attempting to enable package manager proxy support on non-supported platform: #{host.name}: #{host['platform']}")
         end
       end
     end
 
-
     # Merge the two provided hashes so that an array of values is created from collisions
     # @param [Hash] h1 The first hash
     # @param [Hash] h2 The second hash
@@ -545,12 +453,12 @@ module Beaker
     #   => {:PATH=>["/1st/path", "/2nd/path"]}
     def additive_hash_merge h1, h2
       merged_hash = {}
-      normalized_h2 = h2.inject({}) { |h, (k, v)| h[k.to_s.upcase] = v; h }
+      normalized_h2 = h2.each_with_object({}) { |(k, v), h| h[k.to_s.upcase] = v; }
       h1.each_pair do |key, _val|
         normalized_key = key.to_s.upcase
         if normalized_h2.has_key?(normalized_key)
           merged_hash[key] = [h1[key], normalized_h2[normalized_key]]
-          merged_hash[key] = merged_hash[key].uniq #remove dupes
+          merged_hash[key] = merged_hash[key].uniq # remove dupes
         end
       end
       merged_hash
@@ -565,9 +473,7 @@ module Beaker
 
       env.each_key do |key|
         separator = host['pathseparator']
-        if key == 'PATH' && (not host.is_powershell?)
-          separator = ':'
-        end
+        separator = ':' if key == 'PATH' && (not host.is_powershell?)
         env[key] = env[key].join(separator)
       end
       env
@@ -582,7 +488,7 @@ module Beaker
       block_on host do |host|
         skip_msg = host.skip_set_env?
         unless skip_msg.nil?
-          logger.debug( skip_msg )
+          logger.debug(skip_msg)
           next
         end
 
@@ -590,14 +496,12 @@ module Beaker
 
         logger.debug("setting local environment on #{host.name}")
 
-        if host['platform'].include?('windows') && host.is_cygwin?
-         env['CYGWIN'] = 'nodosfilewarning'
-        end
+        env['CYGWIN'] = 'nodosfilewarning' if host['platform'].include?('windows') && host.is_cygwin?
 
         host.ssh_permit_user_environment
         host.ssh_set_user_environment(env)
 
-        #close the host to re-establish the connection with the new sshd settings
+        # close the host to re-establish the connection with the new sshd settings
         host.close
 
         # print out the working env
@@ -608,17 +512,5 @@ module Beaker
         end
       end
     end
-
-    private
-
-    # A helper to tell whether a host is el-based
-    # @param [Host] host the host to act upon
-    #
-    # @return [Boolean] if the host is el_based
-    def el_based? host
-      ['centos','redhat','scientific','el','oracle'].include?(host['platform'].variant)
-    end
-
   end
-
 end

data/lib/beaker/hypervisor/noop.rb

@@ -1,10 +1,9 @@
 module Beaker
   class Noop < Beaker::Hypervisor
+    def initialize(hosts, options)
+      super
 
-    def initialize(new_hosts, options)
-      @options = options
       @logger = options[:logger]
-      @hosts = new_hosts
     end
 
     def validate
@@ -26,6 +25,5 @@ module Beaker
     def cleanup
       # noop
     end
-
   end
 end