beaker 4.16.0 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47866cdc1343ec3c973731ac22f559a8c8bb9191a28b5e0fa502b0161dc77869
-  data.tar.gz: 2120cec9e0a21b849ec959456ccb5c48fefd9f0816ad219cc5e82317147ce53e
+  metadata.gz: 724a2edd64014e6c3c6632ed80a24aa1f4e0f01125c7b982aefdcafdeb9ad900
+  data.tar.gz: 8b61f356b1c6d1334e0b446f65cbbda6282df6b55d6bd233504b37942188c242
 SHA512:
-  metadata.gz: c351c5016c60b958a81bb4ab75a01f059ec679690b9c2e72d0664b45cb2cba3a98aa765be65c81f8518dfa6e84bc59fc959c3ac940641050f000799014d0b35f
-  data.tar.gz: 04935abd0b44d9bb222548af8281ff5b9ee0694ede3e97c91df6c77ca31ef242d9fed732eb52b4f658c7182a6f2e886c99eeac34ce2f6551156cadf31ccace80
+  metadata.gz: 4e10fa9a68e4c58564beb932c09b69dc690af1f0264977d4d723dcf49fa30183456b0ab46c08177ab30c5dde65dccb8a0b2347ee690a218d09c1bf03fbcd17dc
+  data.tar.gz: 4b6e854ad6713186601dff573c51397bcbfb47f07bb0d44fedbac8341d14313bf3b65168495e701a49e7d780bf922c9d2786f2f549027ec7e672d8382293bf80

data/CHANGELOG.md

@@ -11,7 +11,14 @@ Tracking in this Changelog began for this project in version 3.25.0.
 If you're looking for changes from before this, refer to the project's
 git logs & PR history.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.16.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.17.0...master)
+
+# [4.17.0](https://github.com/puppetlabs/beaker/compare/4.16.0...4.17.0) - 2020-02-20
+
+### Added
+
+- Windows support in `host_helpers` ([#1622](https://github.com/puppetlabs/beaker/pull/1622))
+- EL 8 support ([#1623](https://github.com/puppetlabs/beaker/pull/1623))
 
 # [4.16.0](https://github.com/puppetlabs/beaker/compare/4.15.0...4.16.0) - 2020-02-05
 

data/CODEOWNERS

@@ -1 +1,2 @@
 * @puppetlabs/beaker
+* @puppetlabs/dio

data/lib/beaker/dsl/helpers/host_helpers.rb

@@ -431,7 +431,7 @@ module Beaker
         # @return nil
         def add_system32_hosts_entry(host, opts = {})
           if host.is_powershell?
-            hosts_file = "C:\\Windows\\System32\\Drivers\\etc\\hosts"
+            hosts_file = 'C:\Windows\System32\Drivers\etc\hosts'
             host_entry = "#{opts['ip']}`t`t#{opts['name']}"
             on host, powershell("\$text = \\\"#{host_entry}\\\"; Add-Content -path '#{hosts_file}' -value \$text")
           else
@@ -462,6 +462,28 @@ module Beaker
           end
         end
 
+        # Return a Hash with the Alternate Data Stream (ADS) name as well as the
+        # base file path
+        #
+        # @param file_path [String] The full path with the ADS attached
+        #
+        # @return [Hash] The base file path and ADS name
+        def win_ads_path(file_path)
+          ads_path = {
+            path: file_path,
+            ads: nil
+          }
+
+          split_path = file_path.split(':')
+
+          if split_path.size > 2
+            ads_path[:ads] = split_path.pop
+            ads_path[:path] = split_path.join(':')
+          end
+
+          return ads_path
+        end
+
         # Check whether a file exists on the host
         #
         # @param host [Beaker::Host] The target host
@@ -469,9 +491,22 @@ module Beaker
         #
         # @return [Boolean] Whether the file exists on the host (using `test -f`)
         def file_exists_on(host, file_path)
-          host.execute(%(test -f "#{file_path}"), accept_all_exit_codes: true) do |result|
-            return result.exit_code.zero?
+          if host['platform'] =~ /windows/
+            command = %(Test-Path #{file_path})
+
+            if file_path.include?(':')
+              split_path = win_ads_path(file_path)
+
+              command = %(Test-Path #{split_path[:path]})
+              command += %( -AND Get-Item -path #{split_path[:path]} -stream #{split_path[:ads]}) if split_path[:ads]
+            end
+
+            command = powershell(command)
+          else
+            command = %(test -f "#{file_path}")
           end
+
+          return on(host, command, { :accept_all_exit_codes => true}).exit_code.zero?
         end
 
         # Check whether a directory exists on the host
@@ -481,9 +516,15 @@ module Beaker
         #
         # @return [Boolean] Whether the directory exists on the host (using `test -d`)
         def directory_exists_on(host, dir_path)
-          host.execute(%(test -d "#{dir_path}"), accept_all_exit_codes: true) do |result|
-            return result.exit_code.zero?
+          if host['platform'] =~ /windows/
+            dir_path = "#{dir_path}\\" unless (dir_path[-1].chr == '\\')
+
+            command = Command.new(%{IF exist "#{dir_path}" ( exit 0 ) ELSE ( exit 1 )}, [], { :cmdexe => true })
+          else
+            command = Command.new(%(test -d "#{dir_path}"), [])
           end
+
+          return on(host, command, { :accept_all_exit_codes => true }).exit_code.zero?
         end
 
         # Check whether a symlink exists on the host
@@ -493,9 +534,10 @@ module Beaker
         #
         # @return [Boolean] Whether the symlink exists on the host (using `test -L`)
         def link_exists_on(host, link_path)
-          host.execute(%(test -L "#{link_path}"), accept_all_exit_codes: true) do |result|
-            return result.exit_code.zero?
-          end
+          # Links are weird on windows, fall back to seeing if the file exists
+          return file_exists_on(host, link_path) if host['platform'] =~ /windows/
+
+          return on(host, Command.new(%(test -L "#{link_path}"), accept_all_exit_codes: true)).exit_code.zero?
         end
 
         # Get the contents of a file on the host
@@ -505,12 +547,29 @@ module Beaker
         #
         # @return [String] The contents of the file
         def file_contents_on(host, file_path)
-          host.execute(%(cat "#{file_path}"), acceptable_exit_codes: [0]) do |result|
-            return result.stdout
+          file_contents = nil
+
+          split_path = win_ads_path(file_path)
+
+          if file_exists_on(host, split_path[:path])
+            if host['platform'] =~ /windows/
+              file_path.gsub!('/', '\\')
+
+              command = %{Get-Content -Raw -Path #{file_path}}
+              command += %{ -Stream #{split_path[:ads]}} if split_path[:ads]
+
+              file_contents = on(host, powershell(command))&.stdout&.strip
+            else
+              file_contents = on(host, %(cat "#{file_path}"))&.stdout&.strip
+            end
+          else
+            logger.warn("File '#{file_path}' on '#{host} does not exist")
           end
+
+          return file_contents
         end
 
-        #Run a curl command on the provided host(s)
+        # Run a curl command on the provided host(s)
         #
         # @param [Host, Array<Host>, String, Symbol] host    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.

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

@@ -226,7 +226,7 @@ module Unix::Exec
     case self['platform']
     when /debian|ubuntu|cumulus|huaweios/
       exec(Beaker::Command.new("service ssh restart"))
-    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
+    when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|el-8|centos-8|redhat-8|oracle-8|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
       exec(Beaker::Command.new("systemctl restart sshd.service"))
     when /el-|centos|fedora|redhat|oracle|scientific|eos/
       exec(Beaker::Command.new("/sbin/service sshd restart"))
@@ -252,7 +252,7 @@ module Unix::Exec
       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-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7/
+    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"))

data/lib/beaker/host_prebuilt_steps.rb

@@ -450,7 +450,7 @@ module Beaker
         #restart sshd
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
-        elsif host['platform'] =~ /arch|centos-7|el-7|redhat-7|fedora-(1[4-9]|2[0-9]|3[0-9])/
+        elsif host['platform'] =~ /arch|centos-7|el-7|redhat-7|centos-8|el-8|redhat-8|fedora-(1[4-9]|2[0-9]|3[0-9])/
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})

data/lib/beaker/ssh_connection.rb

@@ -69,19 +69,21 @@ module Beaker
       begin
          @logger.debug "Attempting ssh connection to #{host}, user: #{user}, opts: #{ssh_opts}"
          Net::SSH.start(host, user, ssh_opts)
-       rescue *RETRYABLE_EXCEPTIONS => e
-         if try <= max_connection_tries
-           @logger.warn "Try #{try} -- Host #{host} unreachable: #{e.class.name} - #{e.message}" unless options[:silent]
-           @logger.warn "Trying again in #{wait} seconds" unless options[:silent]
-           sleep wait
+      rescue *RETRYABLE_EXCEPTIONS => e
+        if try <= max_connection_tries
+          @logger.warn "Try #{try} -- Host #{host} unreachable: #{e.class.name} - #{e.message}" unless options[:silent]
+          @logger.warn "Trying again in #{wait} seconds" unless options[:silent]
+
+          sleep wait
           (last_wait, wait) = wait, last_wait + wait
-           try += 1
-           retry
-         else
-           @logger.warn "Failed to connect to #{host}, after #{try} attempts" unless options[:silent]
-           nil
-         end
-       end
+          try += 1
+
+          retry
+        else
+          @logger.warn "Failed to connect to #{host}, after #{try} attempts" unless options[:silent]
+          nil
+        end
+      end
     end
 
     # Connect to the host, creating a new connection if required
@@ -287,6 +289,10 @@ module Beaker
       result.stdout = "\n"
 
       begin
+        # This is probably windows with an environment variable so we need to
+        # expand it.
+        target = self.execute(%{echo "#{target}"}).output.strip.gsub('"','') if target.include?('%')
+
         @ssh.scp.upload! source, target, local_opts do |ch, name, sent, total|
           result.stdout << "\tcopying %s: %10d/%d\n" % [name, sent, total]
         end
@@ -319,6 +325,10 @@ module Beaker
       result.stdout = "\n"
 
       begin
+        # This is probably windows with an environment variable so we need to
+        # expand it.
+        source = self.execute(%{echo "#{source}"}).output.strip.gsub('"','') if source.include?('%')
+
         @ssh.scp.download! source, target, local_opts do |ch, name, sent, total|
           result.stdout << "\tcopying %s: %10d/%d\n" % [name, sent, total]
         end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.16.0'
+    STRING = '4.17.0'
   end
 end

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

@@ -303,6 +303,10 @@ module Beaker
                       'oracle-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
                       'redhat-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
                       'scientific-7-x86_64' => ["el/7/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el7.x86_64.rpm"],
+                      'el-8-x86_64' => ["el/8/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el8.x86_64.rpm"],
+                      'centos-8-x86_64' => ["el/8/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el8.x86_64.rpm"],
+                      'oracle-8-x86_64' => ["el/8/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el8.x86_64.rpm"],
+                      'redhat-8-x86_64' => ["el/8/#{puppet_collection}/x86_64", "puppet-agent-#{puppet_agent_version}-1.el8.x86_64.rpm"],
                     }
         platforms.each do |p, v|
           it "accomodates platform #{p} without erroring" do

data/spec/helpers.rb

@@ -137,7 +137,11 @@ module PlatformHelpers
                       'redhat-7',
                       'oracle-7',
                       'scientific-7',
-                      'eos-7'].concat(FEDORASYSTEMD)
+                      'eos-7',
+                      'el-8',
+                      'centos-8',
+                      'redhat-8',
+                      'oracle-8'].concat(FEDORASYSTEMD)
 
   FEDORASYSTEMV    = (1..13).to_a.collect! { |i| "fedora-#{i}" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.16.0
+  version: 4.17.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec