beaker 2.5.1 → 2.6.0

data/lib/beaker/dsl/install_utils.rb

@@ -709,7 +709,7 @@ module Beaker
           end
 
           # Certain install paths may not create the config dirs/files needed
-          on host, "mkdir -p #{host['puppetpath']}"
+          on host, "mkdir -p #{host['puppetpath']}" unless host[:type] =~ /aio/
           on host, "echo '' >> #{host.puppet['hiera_config']}"
         end
         nil
@@ -770,7 +770,7 @@ module Beaker
       # @return nil
       def configure_puppet_on(host, opts = {})
         if host['platform'] =~ /windows/
-          puppet_conf = "#{host['puppetpath']}\\puppet.conf"
+          puppet_conf = host.puppet['config']
           conf_data = ''
           opts.each do |section,options|
             conf_data << "[#{section}]`n"
@@ -781,7 +781,7 @@ module Beaker
           end
           on host, powershell("\$text = \\\"#{conf_data}\\\"; Set-Content -path '#{puppet_conf}' -value \$text")
         else
-          puppet_conf = "#{host['puppetpath']}/puppet.conf"
+          puppet_conf = host.puppet['config']
           conf_data = ''
           opts.each do |section,options|
             conf_data << "[#{section}]\n"
@@ -1426,17 +1426,27 @@ module Beaker
                   :ignore_list => PUPPET_MODULE_INSTALL_IGNORE}.merge(opts)
           ignore_list = build_ignore_list(opts)
           target_module_dir = on( host, "echo #{opts[:target_module_path]}" ).stdout.chomp
-          source = File.expand_path( opts[:source] )
+          source_path = File.expand_path( opts[:source] )
+          source_dir = File.dirname(source_path)
+          source_name = File.basename(source_path)
           if opts.has_key?(:module_name)
             module_name = opts[:module_name]
           else
-            _, module_name = parse_for_modulename( source )
+            _, module_name = parse_for_modulename( source_path )
           end
 
           opts[:protocol] ||= 'scp'
           case opts[:protocol]
             when 'scp'
-              scp_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
+              #move to the host
+              scp_to host, source_path, target_module_dir, {:ignore => ignore_list}
+              #rename to the selected module name, if not correct
+              cur_path = File.join(target_module_dir, source_name)
+              new_path = File.join(target_module_dir, module_name)
+              if cur_path != new_path
+                # NOTE: this will need to be updated to handle powershell only windows SUTs
+                on host, "mv #{cur_path} #{new_path}"
+              end
             when 'rsync'
               rsync_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
             else

data/lib/beaker/host.rb

@@ -212,8 +212,13 @@ module Beaker
     #@return [Boolean] true if x86_64, false otherwise
     def determine_if_x86_64
       if is_cygwin?
-        result = exec(Beaker::Command.new("arch | grep x86_64"), :acceptable_exit_codes => (0...127))
-        result.exit_code == 0
+        if self[:platform] =~ /osx|solaris/
+          result = exec(Beaker::Command.new("uname -a | grep x86_64"), :acceptable_exit_codes => (0...127))
+          result.exit_code == 0
+        else
+          result = exec(Beaker::Command.new("arch | grep x86_64"), :acceptable_exit_codes => (0...127))
+          result.exit_code == 0
+        end
       else
         result = exec(Beaker::Command.new("wmic os get osarchitecture"), :acceptable_exit_codes => (0...127))
         result.stdout =~ /64/
@@ -225,6 +230,29 @@ module Beaker
       @x86_64 ||= determine_if_x86_64
     end
 
+    # Converts the provided environment file to a new shell script in /etc/profile.d, then sources that file.
+    # This is for sles based hosts.
+    # @param [String] env_file The ssh environment file to read from
+    def mirror_env_to_profile_d env_file
+      if self[:platform] =~ /sles-/
+        @logger.debug("mirroring environment to /etc/profile.d on sles platform host")
+        cur_env = exec(Beaker::Command.new("cat #{env_file}")).stdout
+        shell_env = ''
+        cur_env.each_line do |env_line|
+          shell_env << "export #{env_line}"
+        end
+        #here doc it over
+        exec(Beaker::Command.new("cat << EOF > #{self[:profile_d_env_file]}\n#{shell_env}EOF"))
+        #set permissions
+        exec(Beaker::Command.new("chmod +x #{self[:profile_d_env_file]}"))
+        #keep it current
+        exec(Beaker::Command.new("source #{self[:profile_d_env_file]}"))
+      else
+        #noop
+        @logger.debug("will not mirror environment to /etc/profile.d on non-sles platform host")
+      end
+    end
+
     #Add the provided key/val to the current ssh environment
     #@param [String] key The key to add the value to
     #@param [String] val The value for the key
@@ -236,14 +264,17 @@ module Beaker
         env_file = self[:ssh_env_file]
         escaped_val = Regexp.escape(val).gsub('/', '\/').gsub(';', '\;')
         #see if the key/value pair already exists
-        if exec(Beaker::Command.new("grep -e #{key}=.*#{escaped_val} #{env_file}"), :acceptable_exit_codes => (0..255) ).exit_code == 0
+        if exec(Beaker::Command.new("grep #{key}=.*#{escaped_val} #{env_file}"), :acceptable_exit_codes => (0..255) ).exit_code == 0
           return #nothing to do here, key value pair already exists
         #see if the key already exists
         elsif exec(Beaker::Command.new("grep #{key} #{env_file}"), :acceptable_exit_codes => (0..255) ).exit_code == 0
-          exec(Beaker::SedCommand.new(self['HOSTS'][name]['platform'], "s/#{key}=/#{key}=#{escaped_val}:/", env_file))
+          exec(Beaker::SedCommand.new(self['platform'], "s/#{key}=/#{key}=#{escaped_val}:/", env_file))
         else
           exec(Beaker::Command.new("echo \"#{key}=#{val}\" >> #{env_file}"))
         end
+        #update the profile.d to current state
+        #match it to the contents of ssh_env_file
+        mirror_env_to_profile_d(env_file)
       else #powershell windows
         #see if the key/value pair already exists
         result = exec(Beaker::Command.new("set #{key}"), :acceptable_exit_codes => (0..255))
@@ -259,6 +290,15 @@ module Beaker
       end
     end
 
+    #Return the value of a specific env var
+    #@param [String] key The key to look for
+    #@example
+    #  host.get_env_var('path')
+    def get_env_var key
+      key = key.to_s.upcase
+      exec(Beaker::Command.new("env | grep #{key}"), :acceptable_exit_codes => (0..255)).stdout.chomp
+    end
+
     #Delete the provided key/val from the current ssh environment
     #@param [String] key The key to delete the value from
     #@param [String] val The value to delete for the key
@@ -267,11 +307,17 @@ module Beaker
     def delete_env_var key, val
       key = key.to_s.upcase
       if self.is_cygwin?
+        env_file = self[:ssh_env_file]
         val = Regexp.escape(val).gsub('/', '\/').gsub(';', '\;')
         #if the key only has that single value remove the entire line
-        exec(Beaker::SedCommand.new(self['HOSTS'][name]['platform'], "/#{key}=#{val}$/d", self[:ssh_env_file]))
-        #if the key has multiple values and we only need to remove the provided val
-        exec(Beaker::SedCommand.new(self['HOSTS'][name]['platform'], "s/#{key}=\\(.*[:;]*\\)#{val}[:;]*/#{key}=\\1/", self[:ssh_env_file]))
+        exec(Beaker::SedCommand.new(self['platform'], "/#{key}=#{val}$/d", env_file))
+        #value in middle of list
+        exec(Beaker::SedCommand.new(self['platform'], "s/#{key}=\\(.*\\)[;:]#{val}/#{key}=\\1/", env_file))
+        #value in start of list
+        exec(Beaker::SedCommand.new(self['platform'], "s/#{key}=#{val}[;:]/#{key}=/", env_file))
+        #update the profile.d to current state
+        #match it to the contents of ssh_env_file
+        mirror_env_to_profile_d(env_file)
       else #powershell windows
         #get the current value of the key
         result = exec(Beaker::Command.new("set #{key}"), :acceptable_exit_codes => (0..255))
@@ -337,6 +383,12 @@ module Beaker
       end
     end
 
+    # Recursively remove the path provided
+    # @param [String] path The path to remove
+    def rm_rf path
+      exec(Beaker::Command.new("rm -rf #{path}"))
+    end
+
     # Create the provided directory structure on the host
     # @param [String] dir The directory structure to create on the host
     # @return [Boolean] True, if directory construction succeeded, otherwise False
@@ -344,18 +396,31 @@ module Beaker
       if self.is_cygwin?
         cmd = "mkdir -p #{dir}"
       else
-        cmd = "if not exist #{dir.gsub!('/','\\')} (md #{dir.gsub!('/','\\')})"
+        windows_dirstring = dir.gsub('/','\\')
+        cmd = "if not exist #{windows_dirstring} (md #{windows_dirstring})"
       end
 
       result = exec(Beaker::Command.new(cmd), :acceptable_exit_codes => [0, 1])
       result.exit_code == 0
     end
 
-    # scp files from the localhost to this test host, if a directory is provided it is recursively copied
+    # scp files from the localhost to this test host, if a directory is provided it is recursively copied.
+    # If the provided source is a directory both the contents of the directory and the directory
+    # itself will be copied to the host, if you only want to copy directory contents you will either need to specify
+    # the contents file by file or do a separate 'mv' command post scp_to to create the directory structure as desired.
+    # To determine if a file/dir is 'ignored' we compare to any contents of the source dir and NOT any part of the path
+    # to that source dir.
+    #
     # @param source [String] The path to the file/dir to upload
     # @param target [String] The destination path on the host
     # @param options [Hash{Symbol=>String}] Options to alter execution
     # @option options [Array<String>] :ignore An array of file/dir paths that will not be copied to the host
+    # @example
+    #   do_scp_to('source/dir1/dir2/dir3', 'target')
+    #   -> will result in creation of target/source/dir1/dir2/dir3 on host
+    #
+    #   do_scp_to('source/file.rb', 'target', { :ignore => 'file.rb' }
+    #   -> will result in not files copyed to the host, all are ignored
     def do_scp_to source, target, options
       @logger.notify "localhost $ scp #{source} #{@name}:#{target} {:ignore => #{options[:ignore]}}"
 
@@ -365,9 +430,10 @@ module Beaker
       ignore_re = nil
       if has_ignore
         ignore_arr = Array(options[:ignore]).map do |entry|
-          "((\/|\\A)#{entry}(\/|\\z))".gsub(/\./, '\.')
+          "((\/|\\A)#{Regexp.escape(entry)}(\/|\\z))"
         end
         ignore_re = Regexp.new(ignore_arr.join('|'))
+        @logger.debug("going to ignore #{ignore_re}")
       end
 
       # either a single file, or a directory with no ignores
@@ -388,7 +454,7 @@ module Beaker
         end
       else # a directory with ignores
         dir_source = Dir.glob("#{source}/**/*").reject do |f|
-          f =~ ignore_re
+          f.gsub(/\A#{Regexp.escape(source)}/, '') =~ ignore_re #only match against subdirs, not full path
         end
         @logger.trace "After rejecting ignored files/dirs, going to scp [#{dir_source.join(", ")}]"
 
@@ -400,7 +466,7 @@ module Beaker
         required_dirs.each do |dir|
           dir_path = Pathname.new(dir)
           if dir_path.absolute?
-            mkdir_p(File.join(target, dir.gsub(source, '')))
+            mkdir_p(File.join(target, dir.gsub(/#{Regexp.escape(File.dirname(File.absolute_path(source)))}/, '')))
           else
             mkdir_p( File.join(target, dir) )
           end
@@ -411,7 +477,7 @@ module Beaker
         dir_source.each do |s|
           s_path = Pathname.new(s)
           if s_path.absolute?
-            file_path = File.join(target, File.dirname(s).gsub(source,''))
+            file_path = File.join(target, File.dirname(s).gsub(/#{Regexp.escape(File.dirname(File.absolute_path(source)))}/,''))
           else
             file_path = File.join(target, File.dirname(s))
           end

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

@@ -12,6 +12,10 @@ module PSWindows::Exec
     (abs ? ABS_CMD : CMD) + " /c echo. 2> #{file}"
   end
 
+  def rm_rf path
+    execute("del /s /q #{path}")
+  end
+
   def path
     'c:/windows/system32;c:/windows'
   end

data/lib/beaker/host/unix.rb

@@ -26,7 +26,7 @@ module Unix
         'puppetbin'        => '/opt/puppet/bin/puppet',
         'puppetbindir'     => '/opt/puppet/bin',
         'puppetsbindir'    => '/opt/puppet/sbin',
-        'systembindir'     => '/opt/puppet/bin',
+        'privatebindir'    => '/opt/puppetlabs/puppet/bin',
         'puppetvardir'     => '/var/opt/lib/pe-puppet',
         'hieradatadir'     => '/var/lib/hiera',
         'hieraconf'        => '/etc/puppetlabs/puppet/hiera.yaml',
@@ -48,7 +48,7 @@ module Unix
         'puppetvardir'      => '/var/lib/puppet',
         'puppetbin'         => '/usr/bin/puppet',
         'puppetbindir'      => '/usr/bin',
-        'systembindir'      => '/usr/bin',
+        'privatebindir'     => '/usr/bin',
         'hieralibdir'       => '/opt/puppet-git-repos/hiera/lib',
         'hierapuppetlibdir' => '/opt/puppet-git-repos/hiera-puppet/lib',
         'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
@@ -64,17 +64,8 @@ module Unix
       h = Beaker::Options::OptionsHash.new
       h.merge({
         'user'                  => 'root',
-        'group'                 => 'puppet',
-        'puppetserver-confdir'  => '/etc/puppetlabs/puppetserver/conf.d',
-        'puppetservice'         => 'puppetserver',
-        'puppetpath'            => '/etc/puppetlabs/puppet',
-        'puppetconfdir'         => '/etc/puppetlabs/puppet',
-        'puppetvardir'          => '/opt/puppetlabs/puppet/cache',
-        'puppetbin'             => '/opt/puppetlabs/puppet/bin/puppet',
         'puppetbindir'          => '/opt/puppetlabs/bin',
-        'systembindir'          => '/usr/bin',
-        'hieradatadir'          => '/etc/puppetlabs/code/hieradata',
-        'hieraconf'             => '/etc/puppetlabs/code/hiera.yaml',
+        'privatebindir'         => '/opt/puppetlabs/puppet/bin',
         'distmoduledir'         => '/etc/puppetlabs/code/modules',
         'sitemoduledir'         => '/opt/puppetlabs/puppet/modules',
         'pathseparator'         => ':',

data/lib/beaker/host/windows.rb

@@ -58,17 +58,8 @@ module Windows
       h = Beaker::Options::OptionsHash.new
       h.merge({
         'user'              => 'Administrator',
-        'group'             => 'Administrators',
-        # 'puppetserver-confdir' not applicable on Windows
-        # 'puppetservice' not applicable on Windows
-        'puppetpath'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'puppetconfdir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'puppetvardir'      => '`cygpath -smF 35`/PuppetLabs/puppet/cache',
-        # 'puppetbin' not required on Windows
-        'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
-        # systembindir not required on Windows
-        'hieradatadir'      => '`cygpath -smF 35`/Puppetlabs/code/hieradata',
-        'hieraconf'         => '`cygpath -smF 35`/Puppetlabs/code/hiera.yaml',
+        'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
+        'privatebindir'     => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
         'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
         # sitemoduledir not included (check PUP-4049 for more info)
         'pathseparator'     => ';',

data/lib/beaker/host/windows/file.rb

@@ -14,7 +14,7 @@ module Windows::File
   end
 
   def file_exist?(path)
-    result = exec(Beaker::Command.new("test -e #{path}"), :acceptable_exit_codes => [0, 1])
+    result = exec(Beaker::Command.new("test -e '#{path}'"), :acceptable_exit_codes => [0, 1])
     result.exit_code == 0
   end
 end

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

@@ -38,7 +38,7 @@ module Windows::Pkg
   #Examine the host system to determine the architecture, overrides default host determine_if_x86_64 so that wmic is used
   #@return [Boolean] true if x86_64, false otherwise
   def determine_if_x86_64
-    identify_windows_architecture =~ /64/
+    (identify_windows_architecture =~ /64/) == 0
   end
 
   private

data/lib/beaker/host_prebuilt_steps.rb

@@ -350,7 +350,7 @@ module Beaker
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
-          host.exec(Command.new("sudo -E /sbin/service sshd restart"), {:pty => true})
+          host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
         else
           @logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
         end

data/lib/beaker/hypervisor.rb

@@ -30,9 +30,11 @@ module Beaker
           Beaker::Fusion
         when /^ec2$/
           Beaker::AwsSdk
+        when /^vmpooler$/
+          Beaker::Vmpooler
         when /^vcloud$/
           if options['pooling_api']
-            Beaker::VcloudPooled
+            Beaker::Vmpooler
           else
             Beaker::Vcloud
           end
@@ -131,6 +133,6 @@ module Beaker
   end
 end
 
-[ 'vsphere_helper', 'vagrant', 'vagrant_virtualbox', 'vagrant_parallels', 'vagrant_libvirt', 'vagrant_fusion', 'vagrant_workstation', 'fusion', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack' ].each do |lib|
+[ 'vsphere_helper', 'vagrant', 'vagrant_virtualbox', 'vagrant_parallels', 'vagrant_libvirt', 'vagrant_fusion', 'vagrant_workstation', 'fusion', 'aws_sdk', 'vsphere', 'vmpooler', 'vcloud', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack' ].each do |lib|
     require "beaker/hypervisor/#{lib}"
 end

data/lib/beaker/hypervisor/{vcloud_pooled.rb → vmpooler.rb}

@@ -3,7 +3,7 @@ require 'json'
 require 'net/http'
 
 module Beaker
-  class VcloudPooled < Beaker::Hypervisor
+  class Vmpooler < Beaker::Hypervisor
     SSH_EXCEPTIONS = [
       SocketError,
       Timeout::Error,
@@ -15,14 +15,10 @@ module Beaker
       Errno::ENETUNREACH,
     ]
 
-    def initialize(vcloud_hosts, options)
+    def initialize(vmpooler_hosts, options)
       @options = options
       @logger = options[:logger]
-      @hosts = vcloud_hosts
-
-      raise 'You must specify a datastore for vCloud instances!' unless @options['datastore']
-      raise 'You must specify a resource pool for vCloud instances!' unless @options['resourcepool']
-      raise 'You must specify a folder for vCloud instances!' unless @options['folder']
+      @hosts = vmpooler_hosts
     end
 
     def check_url url
@@ -66,7 +62,7 @@ module Beaker
         request_payload[h['template']] = (request_payload[h['template']].to_i + 1).to_s
       end
 
-      @logger.notify "Requesting VM set from vCloud host pool"
+      @logger.notify "Requesting VM set from vmpooler"
 
       last_wait, wait = 0, 1
       waited = 0 #the amount of time we've spent waiting for this host to provision
@@ -93,20 +89,20 @@ module Beaker
 
             h['vmhostname'] = domain ? "#{hostname}.#{domain}" : hostname
 
-            @logger.notify "Using available vCloud host '#{h['vmhostname']}' (#{h.name})"
+            @logger.notify "Using available host '#{h['vmhostname']}' (#{h.name})"
           end
         else
-          raise "VcloudPooled.provision - requested vCloud hosts not available"
+          raise "Vmpooler.provision - requested host set not available"
         end
       rescue JSON::ParserError, RuntimeError, *SSH_EXCEPTIONS => e
         if waited <= @options[:timeout].to_i
-          @logger.debug("Retrying provision for vCloud host after waiting #{wait} second(s) (failed with #{e.class})")
+          @logger.debug("Retrying provision for vmpooler host after waiting #{wait} second(s) (failed with #{e.class})")
           sleep wait
           waited += wait
           last_wait, wait = wait, last_wait + wait
         retry
         end
-        report_and_raise(@logger, e, 'vCloudPooled.provision')
+        report_and_raise(@logger, e, 'Vmpooler.provision')
       end
 
       @logger.notify 'Spent %.2f seconds grabbing VMs' % (Time.now - start)
@@ -120,7 +116,7 @@ module Beaker
 
       start = Time.now
       vm_names.each do |name|
-        @logger.notify "Handing '#{name}' back to pooling API for VM destruction"
+        @logger.notify "Handing '#{name}' back to vmpooler for VM destruction"
 
         uri = URI.parse(get_template_url(@options['pooling_api'], name))
 
@@ -130,7 +126,7 @@ module Beaker
         begin
           response = http.request(request)
         rescue *SSH_EXCEPTIONS => e
-          report_and_raise(@logger, e, 'vCloudPooled.cleanup (http.request)')
+          report_and_raise(@logger, e, 'Vmpooler.cleanup (http.request)')
         end
       end
 

data/lib/beaker/options/presets.rb

@@ -160,6 +160,7 @@ module Beaker
           :pe_version_file_win    => 'LATEST-win',
           :host_env               => {},
           :ssh_env_file           => '~/.ssh/environment',
+          :profile_d_env_file     => '/etc/profile.d/beaker_env.sh',
           :answers                => {
                                      :q_puppet_enterpriseconsole_auth_user_email    => 'admin@example.com',
                                      :q_puppet_enterpriseconsole_auth_password      => '~!@#$%^*-/ aZ',