beaker 2.5.0 → 2.5.1

data/lib/beaker/dsl/install_utils.rb

@@ -168,8 +168,11 @@ module Beaker
         if host['platform'] =~ /windows/
           log_file = "#{File.basename(host['working_dir'])}.log"
           pe_debug = host[:pe_debug] || opts[:pe_debug] ? " && cat #{log_file}" : ''
-          "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /L*V #{log_file} /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'#{pe_debug}"
-
+          if host.is_cygwin?
+            "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /L*V #{log_file} /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'#{pe_debug}"
+          else
+            "cd #{host['working_dir']} &&  msiexec.exe /qn /L*V #{log_file} /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}#{pe_debug}"
+          end
         # Frictionless install didn't exist pre-3.2.0, so in that case we fall
         # through and do a regular install.
         elsif host['roles'].include? 'frictionless' and ! version_is_less(version, '3.2.0')
@@ -347,7 +350,11 @@ module Beaker
           if not link_exists?("#{path}/#{filename}#{extension}")
             raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
           end
-          on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}"
+          if host.is_cygwin?
+            on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}"
+          else
+            on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{path}/#{filename}#{extension}','#{host['working_dir']}\\#{filename}#{extension}')")
+          end
         end
       end
 
@@ -444,6 +451,7 @@ module Beaker
       # @option opts [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
       #                  (Otherwise uses individual Windows hosts pe_ver)
       # @option opts [Symbol] :type (:install) One of :upgrade or :install
+      # @option opts [Boolean] :set_console_password Should we set the PE console password in the answers file?  Used during upgrade only.
       # @option opts [Hash<String>] :answers Pre-set answers based upon ENV vars and defaults
       #                             (See {Beaker::Options::Presets.env_vars})
       #
@@ -509,6 +517,10 @@ module Beaker
         install_hosts.each do |host|
           if host['platform'] =~ /windows/
             on host, installer_cmd(host, opts)
+            if not host.is_cygwin?
+              # HACK: for some reason, post install we need to refresh the connection to make puppet available for execution
+              host.close
+            end
           else
             # We only need answers if we're using the classic installer
             version = host['pe_ver'] || opts[:pe_ver]
@@ -698,7 +710,7 @@ module Beaker
 
           # Certain install paths may not create the config dirs/files needed
           on host, "mkdir -p #{host['puppetpath']}"
-          on host, "echo '' >> #{host['hieraconf']}"
+          on host, "echo '' >> #{host.puppet['hiera_config']}"
         end
         nil
       end
@@ -719,6 +731,69 @@ module Beaker
         end
       end
 
+      # Configure puppet.conf for all hosts based upon a provided Hash
+      # @param [Hash{Symbol=>String}] opts
+      # @option opts [Hash{String=>String}] :main configure the main section of puppet.conf
+      # @option opts [Hash{String=>String}] :agent configure the agent section of puppet.conf
+      #
+      # @api dsl
+      # @return nil
+      def configure_puppet(opts={})
+        hosts.each do |host|
+          configure_puppet_on(host,opts)
+        end
+      end
+
+      # Configure puppet.conf on the given host based upon a provided hash
+      # @param [Host] host The host to configure puppet.conf on
+      # @param [Hash{Symbol=>String}] opts
+      # @option opts [Hash{String=>String}] :main configure the main section of puppet.conf
+      # @option opts [Hash{String=>String}] :agent configure the agent section of puppet.conf
+      #
+      # @example will configure /etc/puppet.conf on the puppet master.
+      #   config = {
+      #     'main' => {
+      #       'server'   => 'testbox.test.local',
+      #       'certname' => 'testbox.test.local',
+      #       'logdir'   => '/var/log/puppet',
+      #       'vardir'   => '/var/lib/puppet',
+      #       'ssldir'   => '/var/lib/puppet/ssl',
+      #       'rundir'   => '/var/run/puppet'
+      #     },
+      #     'agent' => {
+      #       'environment' => 'dev'
+      #     }
+      #   }
+      #   configure_puppet(master, config)
+      #
+      # @api dsl
+      # @return nil
+      def configure_puppet_on(host, opts = {})
+        if host['platform'] =~ /windows/
+          puppet_conf = "#{host['puppetpath']}\\puppet.conf"
+          conf_data = ''
+          opts.each do |section,options|
+            conf_data << "[#{section}]`n"
+            options.each do |option,value|
+              conf_data << "#{option}=#{value}`n"
+            end
+            conf_data << "`n"
+          end
+          on host, powershell("\$text = \\\"#{conf_data}\\\"; Set-Content -path '#{puppet_conf}' -value \$text")
+        else
+          puppet_conf = "#{host['puppetpath']}/puppet.conf"
+          conf_data = ''
+          opts.each do |section,options|
+            conf_data << "[#{section}]\n"
+            options.each do |option,value|
+              conf_data << "#{option}=#{value}\n"
+            end
+            conf_data << "\n"
+          end
+          on host, "echo \"#{conf_data}\" > #{puppet_conf}"
+        end
+      end
+
       # Installs Puppet and dependencies using rpm
       #
       # @param [Host] host The host to install packages on
@@ -813,7 +888,7 @@ module Beaker
           raise "Puppet #{version} at #{link} does not exist!"
         end
 
-        if host['is_cygwin'].nil? or host['is_cygwin'] == true
+        if host.is_cygwin?
           dest = "#{host['dist']}.msi"
           on host, "curl -O #{link}"
 
@@ -989,6 +1064,12 @@ module Beaker
       #       for Unix like systems and puppet-enterprise-VERSION.msi for Windows systems.
       # @api dsl
       def upgrade_pe path=nil
+        set_console_password = false
+        # if we are upgrading from something lower than 3.4 then we need to set the pe console password
+        if (dashboard[:pe_ver] ? version_is_less(dashboard[:pe_ver], "3.4.0") : true)
+          set_console_password = true
+        end
+        # get new version information
         hosts.each do |host|
           host['pe_dir'] = host['pe_upgrade_dir'] || path
           if host['platform'] =~ /windows/
@@ -1002,8 +1083,8 @@ module Beaker
             host['pe_installer'] ||= 'puppet-enterprise-upgrader'
           end
         end
-        #send in the global options hash
-        do_install(sorted_hosts, options.merge({:type => :upgrade}))
+        # send in the global options hash
+        do_install(sorted_hosts, options.merge({:type => :upgrade, :set_console_password => set_console_password}))
         options['upgrade'] = true
       end
 
@@ -1202,6 +1283,11 @@ module Beaker
         when /^(debian|ubuntu|cumulus)$/
           release_path << "deb/#{codename}"
           release_file = "puppet-agent_#{opts[:version]}-1_#{arch}.deb"
+        when /^windows$/
+          release_path << 'windows'
+          onhost_copy_base = '`cygpath -smF 35`/'
+          arch_suffix = arch =~ /64/ ? '64' : '86'
+          release_file = "puppet-agent-x#{arch_suffix}.msi"
         else
           raise "No repository installation step for #{variant} yet..."
         end
@@ -1216,6 +1302,10 @@ module Beaker
         when /^(debian|ubuntu|cumulus)$/
           on host, "dpkg -i --force-all #{onhost_copied_file}"
           on host, "apt-get update"
+        when /^windows$/
+          result = on host, "echo #{onhost_copied_file}"
+          onhost_copied_file = result.raw_output.chomp
+          on host, Command.new("start /w #{onhost_copied_file}", [], { :cmdexe => true })
         end
       end
 
@@ -1325,6 +1415,8 @@ module Beaker
       #                   Location where the module should be installed, will default
       #                    to host['distmoduledir']/modules
       # @option opts [Array] :ignore_list
+      # @option opts [String] :protocol
+      #                   Name of the underlying transfer method. Valid options are 'scp' or 'rsync'.
       # @raise [ArgumentError] if not host is provided or module_name is not provided and can not be found in Modulefile
       #
       def copy_module_to(one_or_more_hosts, opts = {})
@@ -1340,7 +1432,17 @@ module Beaker
           else
             _, module_name = parse_for_modulename( source )
           end
-          scp_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
+
+          opts[:protocol] ||= 'scp'
+          case opts[:protocol]
+            when 'scp'
+              scp_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
+            when 'rsync'
+              rsync_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
+            else
+              logger.debug "Unsupported transfer protocol, returning nil"
+              nil
+          end
         end
       end
       alias :copy_root_module_to :copy_module_to

data/lib/beaker/dsl/wrappers.rb

@@ -129,9 +129,17 @@ module Beaker
           'NonInteractive'  => ''
         }
         ps_opts.merge!(args)
+        ps_args = []
+        ps_opts.each do |k, v|
+          if v.eql?('') or v.nil?
+            ps_args << "-#{k}"
+          else
+            ps_args << "-#{k} #{v}"
+          end
+        end
+        ps_args << "-Command #{command}"
 
-        arguments = " #{ps_opts.sort.map{|k,v| v.eql?('') ? "-#{k}" : "-#{k} #{v}" }.join(' ')} -Command \"#{command}\""
-        Command.new('powershell.exe', arguments, {})
+        Command.new("powershell.exe", ps_args)
       end
     end
   end

data/lib/beaker/host.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'timeout'
 require 'benchmark'
+require 'rsync'
 
 [ 'command', 'ssh_connection' ].each do |lib|
   require "beaker/#{lib}"
@@ -144,6 +145,14 @@ module Beaker
       @options.is_pe?
     end
 
+    def is_cygwin?
+      self['is_cygwin'] == nil || self['is_cygwin'] == true
+    end
+
+    def platform
+      self['platform']
+    end
+
     # True if this is a pe run, or if the host has had a 'use-service' property set.
     def use_service_scripts?
       is_pe? || self['use-service']
@@ -202,8 +211,13 @@ module Beaker
     #Examine the host system to determine the architecture
     #@return [Boolean] true if x86_64, false otherwise
     def determine_if_x86_64
-      result = exec(Beaker::Command.new("arch | grep x86_64"), :acceptable_exit_codes => (0...127))
-      result.exit_code == 0
+      if is_cygwin?
+        result = exec(Beaker::Command.new("arch | grep x86_64"), :acceptable_exit_codes => (0...127))
+        result.exit_code == 0
+      else
+        result = exec(Beaker::Command.new("wmic os get osarchitecture"), :acceptable_exit_codes => (0...127))
+        result.stdout =~ /64/
+      end
     end
 
     #@return [Boolean] true if x86_64, false otherwise
@@ -218,16 +232,30 @@ module Beaker
     #  host.add_env_var('PATH', '/usr/bin:PATH')
     def add_env_var key, val
       key = key.to_s.upcase
-      escaped_val = Regexp.escape(val).gsub('/', '\/').gsub(';', '\;')
-      env_file = self[:ssh_env_file]
-      #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
-        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))
-      else
-        exec(Beaker::Command.new("echo \"#{key}=#{val}\" >> #{env_file}"))
+      if self.is_cygwin?
+        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
+          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))
+        else
+          exec(Beaker::Command.new("echo \"#{key}=#{val}\" >> #{env_file}"))
+        end
+      else #powershell windows
+        #see if the key/value pair already exists
+        result = exec(Beaker::Command.new("set #{key}"), :acceptable_exit_codes => (0..255))
+        subbed_result = result.stdout.chomp
+        if result.exit_code == 0
+          subbed_result = subbed_result.gsub(/#{Regexp.escape(val.gsub(/'|"/, ''))}/, '')
+        end
+        #not present, add it
+        if subbed_result == result.stdout.chomp
+          exec(Beaker::Command.new("setx /M #{key} %#{key}%;#{val}"))
+          exec(Beaker::Command.new("set #{key}=%#{key}%;#{val}"))
+        end
       end
     end
 
@@ -237,11 +265,25 @@ module Beaker
     #@example
     #  host.delete_env_var('PATH', '/usr/bin:PATH')
     def delete_env_var key, val
-      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]))
+      key = key.to_s.upcase
+      if self.is_cygwin?
+        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]))
+      else #powershell windows
+        #get the current value of the key
+        result = exec(Beaker::Command.new("set #{key}"), :acceptable_exit_codes => (0..255))
+        subbed_result = result.stdout.chomp
+        if result.exit_code == 0
+          subbed_result = subbed_result.gsub(/#{Regexp.escape(val.gsub(/'|"/, ''))}/, '')
+        end
+        if subbed_result != result
+          #set to the truncated value
+          self.add_env_var(key, subbed_result)
+        end
+      end
     end
 
     def connection
@@ -299,7 +341,7 @@ module Beaker
     # @param [String] dir The directory structure to create on the host
     # @return [Boolean] True, if directory construction succeeded, otherwise False
     def mkdir_p dir
-      if self['is_cygwin'].nil? or self['is_cygwin'] == true
+      if self.is_cygwin?
         cmd = "mkdir -p #{dir}"
       else
         cmd = "if not exist #{dir.gsub!('/','\\')} (md #{dir.gsub!('/','\\')})"
@@ -389,6 +431,79 @@ module Beaker
       return result
     end
 
+    # rsync a file or directory from the localhost to this test host
+    # @param from_path [String] The path to the file/dir to upload
+    # @param to_path [String] The destination path on the host
+    # @param opts [Hash{Symbol=>String}] Options to alter execution
+    # @option opts [Array<String>] :ignore An array of file/dir paths that will not be copied to the host
+    def do_rsync_to from_path, to_path, opts = {}
+      ssh_opts = self['ssh']
+      rsync_args = []
+      ssh_args = []
+
+      if not File.file?(from_path) and not File.directory?(from_path)
+        raise IOError, "No such file or directory - #{from_path}"
+      end
+
+      # We enable achieve mode and compression
+      rsync_args << "-az"
+
+      if not self['user']
+        user = "root"
+      else
+        user = self['user']
+      end
+      hostname_with_user = "#{user}@#{self}"
+
+      Rsync.host = hostname_with_user
+
+      if ssh_opts.has_key?('keys') and
+        ssh_opts.has_key?('auth_methods') and
+        ssh_opts['auth_methods'].include?('publickey')
+
+        key = ssh_opts['keys']
+
+        # If an array was set, then we use the first value
+        if key.is_a? Array
+          key = key.first
+        end
+
+        # We need to expand tilde manually as rsync can be
+        # funny sometimes
+        key = File.expand_path(key)
+
+        ssh_args << "-i #{key}"
+      end
+
+      if ssh_opts.has_key?('port') and
+        ssh_args << "-p #{ssh_opts['port']}"
+      end
+
+      # We disable prompt when host isn't known
+      ssh_args << "-o 'StrictHostKeyChecking no'"
+
+      if not ssh_args.empty?
+        rsync_args << "-e \"ssh #{ssh_args.join(' ')}\""
+      end
+
+      if opts.has_key?(:ignore) and not opts[:ignore].empty?
+        opts[:ignore].map! do |value|
+          "--exclude '#{value}'"
+        end
+        rsync_args << opts[:ignore].join(' ')
+      end
+
+      # We assume that the *contents* of the directory 'from_path' needs to be
+      # copied into the directory 'to_path'
+      if File.directory?(from_path) and not from_path.end_with?('/')
+        from_path += '/'
+      end
+
+      @logger.notify "rsync: localhost:#{from_path} to #{hostname_with_user}:#{to_path} {:ignore => #{opts[:ignore]}}"
+      result = Rsync.run(from_path, to_path, rsync_args)
+      result
+    end
+
   end
 
   [ 'windows', 'pswindows', 'unix', 'aix', 'mac' ].each do |lib|

data/lib/beaker/host/pswindows.rb

@@ -20,7 +20,7 @@ module PSWindows
         'user'          => 'Administrator',
         'group'         => 'Administrators',
         'distmoduledir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules',
-        'sitemoduledir'     => 'C:\\usr\\share\\puppet\\modules',
+        'sitemoduledir' => 'C:\\usr\\share\\puppet\\modules',
         'puppetservice' => 'pe-httpd',
         'pathseparator' => ';',
         'puppetpath'    => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
@@ -28,52 +28,26 @@ module PSWindows
         'puppetcodedir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
         'hieraconf'     => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\hiera.yaml',
         'puppetvardir'  => 'C:\\ProgramData\\PuppetLabs\\puppet\\var',
-        })
-
-        if platform.include?('amd64')
-          h.merge({
-            'puppetbindir'  => 'C:\\Program Files (x86)\\PuppetLabs\\Puppet Enterprise\\bin'
-            })
-          else
-            h.merge({
-              'puppetbindir'  => 'C:\\Program Files\\PuppetLabs\\Puppet Enterprise\\bin'
-              })
-            end
-          end
-
-          def self.foss_defaults
-            h = Beaker::Options::OptionsHash.new
-            h.merge({
-              'user'              => 'Administrator',
-              'group'             => 'Administrators',
-              'distmoduledir'     => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules',
-              'sitemoduledir'     => 'C:\\usr\\share\\puppet\\modules',
-              'hieralibdir'       => 'C:\\opt\\puppet-git-repos\\hiera\\lib',
-              'hierapuppetlibdir' => 'C:\\opt\\puppet-git-repos\\hiera-puppet\\lib',
-              'hierabindir'       => 'C:\\opt\\puppet-git-repos\\hiera\\bin',
-              'pathseparator'     => ';'
-              })
-
-              if h['platform'] && h['platform'].include?('amd64')
-                h.merge({
-                  'puppetpath'    => "C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc",
-                  'puppetconfdir' => "C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc",
-                  'puppetcodedir' => "C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc",
-                  'hieraconf'     => "C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc\\hiera.yaml",
-                  'puppetvardir'  => 'C:\\Program Files (x86)\\Puppet Labs\\Puppet\\var',
-                  'puppetbindir'  => "C:\\Program Files (x86)\\Puppet Labs\\Puppet\\bin"
-                  })
-                else
-                  h.merge({
-                    'puppetpath'    => "C:\\Program Files\\Puppet Labs\\Puppet\\etc",
-                    'puppetconfdir' => "C:\\Program Files\\Puppet Labs\\Puppet\\etc",
-                    'puppetcodedir' => "C:\\Program Files\\Puppet Labs\\Puppet\\etc",
-                    'hieraconf'     => "C:\\Program Files\\Puppet Labs\\Puppet\\etc\\hiera.yaml",
-                    'puppetvardir'  => 'C:\\Program Files\\Puppet Labs\\Puppet\\var',
-                    'puppetbindir'  => "C:\\Program Files\\Puppet Labs\\Puppet\\bin"
-                    })
-                  end
+        'puppetbindir'  => '"C:\\Program Files (x86)\\PuppetLabs\\Puppet Enterprise\\bin";"C:\\Program Files\\PuppetLabs\\Puppet Enterprise\\bin"'
+      })
+    end
 
-                end
-              end
-            end
+    def self.foss_defaults
+      h = Beaker::Options::OptionsHash.new
+      h.merge({
+        'user'              => 'Administrator',
+        'group'             => 'Administrators',
+        'distmoduledir'     => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules',
+        'sitemoduledir'     => 'C:\\usr\\share\\puppet\\modules',
+        'hieralibdir'       => 'C:\\opt\\puppet-git-repos\\hiera\\lib',
+        'hierapuppetlibdir' => 'C:\\opt\\puppet-git-repos\\hiera-puppet\\lib',
+        'hierabindir'       => 'C:\\opt\\puppet-git-repos\\hiera\\bin',
+        'pathseparator'     => ';',
+        'puppetpath'        => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc";"C:\\Program Files\\Puppet Labs\\Puppet\\etc"',
+        'hieraconf'         => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc\\hiera.yaml";"C:\\Program Files\\Puppet Labs\\Puppet\\etc\\hiera.yaml"',
+        'puppetvardir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\var";"C:\\Program Files\\Puppet Labs\\Puppet\\var"',
+        'puppetbindir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\bin"',
+      })
+    end
+  end
+end