beaker 1.12.2 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 327165664795e4a3418eee13044471c769062bdf
-  data.tar.gz: 46c4deee7cfdcf64a2f2903246a4a1f54d132b02
 SHA512: 
-  metadata.gz: 83dd205dea040996a658f04cec6389ba31b8cbccfd38f9dc608fc94bcaee5eca74c718939e0acd7b3794c2aba0236d36a09214279ef678691b903a11c9bb17f0
-  data.tar.gz: b4c851da76c6e21e4e6a8a5ba3ff229f09b9432dc0a409ccdd52cc221ad9e43868c1c9f3c11e343d57b7ecf18d3dde7601166ad94120cff45c832481b272fb1c
+  metadata.gz: 04798de71557fef76c3111cf6726848d4d2210228bf6e25b2a62f4b6d6e9f6dad68941d8a6d1f82bdaac20a17b489c368c7f0eeffb74d737d3d6ab97a5081a9f
+  data.tar.gz: b4c13c397bb66622d416b79c89d90e26e2a35375816be593a0a2fbb8a635710d35d5a296fd73189dcf707150cf4cd7e0c0bca2d5a57f4bb41d5237a12819e29e
+SHA1: 
+  metadata.gz: 78d3632cc61dad21e8198a67510fe578da1be559
+  data.tar.gz: a0443c85c98bcbe560d41ad0aa5c4215dceecf49

data/beaker.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'blimpy', '~> 0.6'
   s.add_runtime_dependency 'fission', '~> 0.4'
   s.add_runtime_dependency 'google-api-client', '~> 0.7.1'
-  s.add_runtime_dependency 'aws-sdk', '~> 1.38'
+  s.add_runtime_dependency 'aws-sdk', '1.42.0'
   s.add_runtime_dependency 'docker-api' unless RUBY_VERSION < '1.9'
 
   # These are transitive dependencies that we include or pin to because...

data/lib/beaker/cli.rb

@@ -10,6 +10,7 @@ module Beaker
     |   |   | "
 
     def initialize
+      @timestamp = Time.now
       @options_parser = Beaker::Options::Parser.new
       @options = @options_parser.parse_args
       @logger = Beaker::Logger.new(@options)
@@ -132,7 +133,7 @@ module Beaker
         return
       end
       Beaker::TestSuite.new(
-        suite_name, @hosts, @options, failure_strategy
+        suite_name, @hosts, @options, @timestamp, failure_strategy
       ).run_and_raise_on_failure
     end
 

data/lib/beaker/dsl/helpers.rb

@@ -273,6 +273,40 @@ module Beaker
         end
       end
 
+      # Create a temp directory on remote host owned by specified user.
+      #
+      # @param [Host] host A single remote host on which to create and adjust
+      # the ownership of a temp directory.
+      # @param [String] name A remote path prefix for the new temp
+      # directory. Default value is '/tmp/beaker'
+      # @param [String] user The name of user that should own the temp
+      # directory. If no username is specified, use `puppet master
+      # --configprint user` to obtain username from master. Raise RuntimeError
+      # if this puppet command returns a non-zero exit code.
+      #
+      # @return [String] Returns the name of the newly-created file.
+      def create_tmpdir_for_user(host, name='/tmp/beaker', user=nil)
+        if not user
+          result = on(host, "puppet master --configprint user")
+          if not result.exit_code == 0
+            raise "`puppet master --configprint` failed, check that puppet is installed on #{host} or explicitly pass in a user name."
+          end
+          user = result.stdout.strip
+        end
+
+        if not on(host, "getent passwd #{user}").exit_code == 0
+          raise "User #{user} does not exist on #{host}."
+        end
+
+        if defined? host.tmpdir
+          dir = host.tmpdir(name)
+          on host, "chown #{user}.#{user} #{dir}"
+          return dir
+        else
+          raise "Host platform not supported by `create_tmpdir_for_user`."
+        end
+      end
+
       # Move a local script to a remote host and execute it
       # @note this relies on {#on} and {#scp_to}
       #
@@ -718,6 +752,10 @@ module Beaker
       #                         from Puppet verion 3.2
       #                         By default it will use the 'current' parser.
       #
+      # @option opts [Boolean]  :noop (false) If this option exists, the
+      #                         the "--noop" command line parameter will be
+      #                         passed to the 'puppet apply' command.
+      #
       # @option opts [String]   :modulepath The search path for modules, as
       #                         a list of directories separated by the system
       #                         path separator character. (The POSIX path separator
@@ -737,36 +775,42 @@ module Beaker
         on_options = {}
         on_options[:acceptable_exit_codes] = Array(opts[:acceptable_exit_codes])
 
-        args = ["--verbose"]
-        args << "--parseonly" if opts[:parseonly]
-        args << "--trace" if opts[:trace]
-        args << "--parser future" if opts[:future_parser]
-        args << "--modulepath #{opts[:modulepath]}" if opts[:modulepath]
+        puppet_apply_opts = {}
+        puppet_apply_opts[:verbose] = nil
+        puppet_apply_opts[:parseonly] = nil if opts[:parseonly]
+        puppet_apply_opts[:trace] = nil if opts[:trace]
+        puppet_apply_opts[:parser] = 'future' if opts[:future_parser]
+        puppet_apply_opts[:modulepath] = opts[:modulepath] if opts[:modulepath]
+        puppet_apply_opts[:noop] = nil if opts[:noop]
 
         # From puppet help:
         # "... an exit code of '2' means there were changes, an exit code of
         # '4' means there were failures during the transaction, and an exit
         # code of '6' means there were both changes and failures."
-        if [opts[:catch_changes],opts[:catch_failures],opts[:expect_failures],opts[:expect_changes]].select{|x|x}.length > 1
-          raise(ArgumentError, "Cannot specify more than one of `catch_failures`, `catch_changes`, `expect_failures`, or `expect_changes` for a single manifest")
+        if [opts[:catch_changes],opts[:catch_failures],opts[:expect_failures],opts[:expect_changes]].compact.length > 1
+          raise(ArgumentError,
+                'Cannot specify more than one of `catch_failures`, ' +
+                '`catch_changes`, `expect_failures`, or `expect_changes` ' +
+                'for a single manifest')
         end
+
         if opts[:catch_changes]
-          args << '--detailed-exitcodes'
+          puppet_apply_opts['detailed-exitcodes'] = nil
 
           # We're after idempotency so allow exit code 0 only.
           on_options[:acceptable_exit_codes] |= [0]
         elsif opts[:catch_failures]
-          args << '--detailed-exitcodes'
+          puppet_apply_opts['detailed-exitcodes'] = nil
 
           # We're after only complete success so allow exit codes 0 and 2 only.
           on_options[:acceptable_exit_codes] |= [0, 2]
         elsif opts[:expect_failures]
-          args << '--detailed-exitcodes'
+          puppet_apply_opts['detailed-exitcodes'] = nil
 
           # We're after failures specifically so allow exit codes 1, 4, and 6 only.
           on_options[:acceptable_exit_codes] |= [1, 4, 6]
         elsif opts[:expect_changes]
-          args << '--detailed-exitcodes'
+          puppet_apply_opts['detailed-exitcodes'] = nil
 
           # We're after changes specifically so allow exit code 2 only.
           on_options[:acceptable_exit_codes] |= [2]
@@ -784,13 +828,17 @@ module Beaker
         # value of *args to a new hash with just one entry (the value of which
         # is our environment variables hash)
         if opts.has_key?(:environment)
-          args << { :environment => opts[:environment]}
+          puppet_apply_opts['ENV'] = opts[:environment]
         end
 
         file_path = host.tmpfile('apply_manifest.pp')
         create_remote_file(host, file_path, manifest + "\n")
-        args << file_path
-        on host, puppet( 'apply', *args), on_options, &block
+
+        if host[:default_apply_opts].respond_to? :merge
+          puppet_apply_opts = host[:default_apply_opts].merge( puppet_apply_opts )
+        end
+
+        on host, puppet('apply', file_path, puppet_apply_opts), on_options, &block
       end
 
       # Runs 'puppet apply' on default host, piping manifest through stdin
@@ -916,18 +964,26 @@ module Beaker
         retry_command(desc, host, "curl -m 1 #{url}", desired_exit_codes, max_retries, retry_interval)
       end
 
-      def retry_command(desc, host, command, desired_exit_codes = 0, max_retries = 60, retry_interval = 1)
+      def retry_command(desc, host, command, desired_exit_codes = 0,
+                        max_retries = 60, retry_interval = 1, verbose = false)
+        log_prefix = host.log_prefix
+        @logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{command}"
+        @logger.debug "  Trying command #{max_retries} times."
+        @logger.debug ".", add_newline=false
         desired_exit_codes = [desired_exit_codes].flatten
-        result = on host, command, :acceptable_exit_codes => (0...127)
+        result = on host, command, {:acceptable_exit_codes => (0...127), :silent => !verbose}
         num_retries = 0
         until desired_exit_codes.include?(result.exit_code)
           sleep retry_interval
-          result = on host, command, :acceptable_exit_codes => (0...127)
+          result = on host, command, {:acceptable_exit_codes => (0...127), :silent => !verbose}
           num_retries += 1
+          @logger.debug ".", add_newline=false
           if (num_retries > max_retries)
-            fail("Unable to #{desc}")
+            @logger.debug "  Command \`#{command}\` failed."
+            fail("Command \`#{command}\` failed.")
           end
         end
+        @logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{command} ostensibly successful."
       end
 
       #Is semver-ish version a less than semver-ish version b

data/lib/beaker/dsl/install_utils.rb

@@ -352,9 +352,11 @@ module Beaker
 
         fetch_puppet(hosts, opts)
 
-        hosts.each do |host|
-          # Database host was added in 3.0. Skip it if installing an older version
-          next if host == database and host != master and host != dashboard and pre30database
+        # If we're installing a database version less than 3.0, ignore the database host
+        install_hosts = hosts.dup
+        install_hosts.delete(database) if pre30database and database != master and database != dashboard
+
+        install_hosts.each do |host|
           if host['platform'] =~ /windows/
             on host, installer_cmd(host, opts)
           elsif host['platform'] =~ /osx/
@@ -378,14 +380,8 @@ module Beaker
 
             on host, installer_cmd(host, opts)
           end
-        end
 
-        # If we're installing a database version less than 3.0, ignore the database host
-        install_hosts = hosts.dup
-        install_hosts.delete(database) if pre30database and database != master and database != dashboard
-
-        # On each agent, we ensure the certificate is signed then shut down the agent
-        install_hosts.each do |host|
+          # On each agent, we ensure the certificate is signed then shut down the agent
           sign_certificate_for(host)
           stop_agent_on(host)
         end
@@ -440,57 +436,194 @@ module Beaker
         special_nodes + real_agents
       end
 
-      #Install POSS based upon host configuration and options
-      # @example
-      #  install_puppet
+      #Install FOSS based upon host configuration and options
+      # @example will install puppet 3.6.1 from native puppetlabs provided packages wherever possible and will fail over to gem installation when impossible
+      #  install_puppet({
+      #    :version        => '3.6.1',
+      #    :facter_version => '2.0.1',
+      #    :hiera_version  => '1.3.3',
+      #    :default_action => 'gem_install'
+      #
+      # @example Will install latest packages on Enterprise Linux and Debian based distros and fail hard on all othere platforms.
+      #  install_puppet()
       #
       # @note This will attempt to add a repository for apt.puppetlabs.com on
       #       Debian or Ubuntu machines, or yum.puppetlabs.com on EL or Fedora
-      #       machines, then install the package 'puppet'
+      #       machines, then install the package 'puppet'.
       #
       # @api dsl
       # @return nil
+      # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
+      # @raise [FailTest] When error occurs during the actual installation process
       def install_puppet(opts = {})
         hosts.each do |host|
           if host['platform'] =~ /el-(5|6|7)/
             relver = $1
-            on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-#{relver}.noarch.rpm"
-            on host, 'yum install -y puppet'
+            install_puppet_from_rpm host, opts.merge(:release => relver, :family => 'el')
           elsif host['platform'] =~ /fedora-(\d+)/
             relver = $1
-            on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-fedora-#{relver}.noarch.rpm"
-            on host, 'yum install -y puppet'
+            install_puppet_from_rpm host, opts.merge(:release => relver, :family => 'fedora')
           elsif host['platform'] =~ /(ubuntu|debian)/
-            if ! host.check_for_package 'lsb-release'
-              host.install_package('lsb-release')
-            end
-            if ! host.check_for_package 'curl'
-              on host, 'apt-get install -y curl'
-            end
-            on host, 'curl -O http://apt.puppetlabs.com/puppetlabs-release-$(lsb_release -c -s).deb'
-            on host, 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb'
-            on host, 'apt-get update'
-            on host, 'apt-get install -y puppet'
+            install_puppet_from_deb host, opts
           elsif host['platform'] =~ /windows/
             relver = opts[:version]
-            on host, "curl -O http://downloads.puppetlabs.com/windows/puppet-#{relver}.msi"
-            on host, "msiexec /qn /i puppet-#{relver}.msi"
-
-            #Because the msi installer doesn't add Puppet to the environment path
-            if fact_on(host, 'architecture').eql?('x86_64')
-              install_dir = '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin'
+            install_puppet_from_msi host, opts
+          elsif host['platform'] =~ /osx/
+            install_puppet_from_dmg host, opts
+          else
+            if opts[:default_action] == 'gem_install'
+              install_puppet_from_gem host, opts
             else
-              install_dir = '/cygdrive/c/Program Files/Puppet Labs/Puppet/bin'
+              raise "install_puppet() called for unsupported platform '#{host['platform']}' on '#{host.name}'"
             end
-            on host, %Q{ echo 'export PATH=$PATH:"#{install_dir}"' > /etc/bash.bashrc }
-
-          else
-            raise "install_puppet() called for unsupported platform '#{host['platform']}' on '#{host.name}'"
           end
         end
         nil
       end
 
+      # Installs Puppet and dependencies using rpm
+      #
+      # @param [Host] host The host to install packages on
+      # @param [Hash{Symbol=>String}] opts An options hash
+      # @option opts [String] :version The version of Puppet to install, if nil installs latest version
+      # @option opts [String] :facter_version The version of Facter to install, if nil installs latest version
+      # @option opts [String] :hiera_version The version of Hiera to install, if nil installs latest version
+      # @option opts [String] :default_action What to do if we don't know how to install native packages on host.
+      #                                       Valid value is 'gem_install' or nil. If nil raises an exception when
+      #                                       on an unsupported platform. When 'gem_install' attempts to install
+      #                                       Puppet via gem.
+      # @option opts [String] :release The major release of the OS
+      # @option opts [String] :family The OS family (one of 'el' or 'fedora')
+      # 
+      # @return nil
+      # @api private
+      def install_puppet_from_rpm( host, opts )
+        release_package_string = "http://yum.puppetlabs.com/puppetlabs-release-#{opts[:family]}-#{opts[:release]}.noarch.rpm" 
+
+        on host, "rpm -ivh #{release_package_string}"
+
+        if opts[:facter_version]
+          on host, "yum install -y facter-#{opts[:facter_version]}"
+        end
+
+        if opts[:hiera_version]
+          on host, "yum install -y hiera-#{opts[:hiera_version]}"
+        end
+
+        puppet_pkg = opts[:version] ? "puppet-#{opts[:version]}" : 'puppet'
+        on host, "yum install -y #{puppet_pkg}"
+      end
+
+      # Installs Puppet and dependencies from deb
+      #
+      # @param [Host] host The host to install packages on
+      # @param [Hash{Symbol=>String}] opts An options hash
+      # @option opts [String] :version The version of Puppet to install, if nil installs latest version
+      # @option opts [String] :facter_version The version of Facter to install, if nil installs latest version
+      # @option opts [String] :hiera_version The version of Hiera to install, if nil installs latest version
+      # 
+      # @return nil
+      # @api private
+      def install_puppet_from_deb( host, opts )
+        if ! host.check_for_package 'lsb-release'
+          host.install_package('lsb-release')
+        end
+
+        if ! host.check_for_package 'curl'
+          on host, 'apt-get install -y curl'
+        end
+
+        on host, 'curl -O http://apt.puppetlabs.com/puppetlabs-release-$(lsb_release -c -s).deb'
+        on host, 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb'
+        on host, 'apt-get update'
+
+        if opts[:facter_version]
+          on host, "apt-get install -y facter=#{opts[:facter_version]}-1puppetlabs1"
+        end
+
+        if opts[:hiera_version]
+          on host, "apt-get install -y hiera=#{opts[:hiera_version]}-1puppetlabs1"
+        end
+
+        puppet_pkg = opts[:version] ? "puppet=#{opts[:version]}-1puppetlabs1" : 'puppet'
+        on host, "apt-get install -y #{puppet_pkg}"
+      end
+
+      # Installs Puppet and dependencies from msi
+      #
+      # @param [Host] host The host to install packages on
+      # @param [Hash{Symbol=>String}] opts An options hash
+      # @option opts [String] :version The version of Puppet to install, required
+      # 
+      # @return nil
+      # @api private
+      def install_puppet_from_msi( host, opts )
+        on host, "curl -O http://downloads.puppetlabs.com/windows/puppet-#{opts[:version]}.msi"
+        on host, "msiexec /qn /i puppet-#{relver}.msi"
+
+        #Because the msi installer doesn't add Puppet to the environment path
+        if fact_on(host, 'architecture').eql?('x86_64')
+          install_dir = '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin'
+        else
+          install_dir = '/cygdrive/c/Program Files/Puppet Labs/Puppet/bin'
+        end
+        on host, %Q{ echo 'export PATH=$PATH:"#{install_dir}"' > /etc/bash.bashrc }
+      end
+
+      # Installs Puppet and dependencies from dmg
+      #
+      # @param [Host] host The host to install packages on
+      # @param [Hash{Symbol=>String}] opts An options hash
+      # @option opts [String] :version The version of Puppet to install, required
+      # @option opts [String] :facter_version The version of Facter to install, required
+      # @option opts [String] :hiera_version The version of Hiera to install, required
+      # 
+      # @return nil
+      # @api private
+      def install_puppet_from_dmg( host, opts )
+        puppet_ver = opts[:version]
+        facter_ver = opts[:facter_version]
+        hiera_ver = opts[:hiera_version]
+
+        on host, "curl -O http://downloads.puppetlabs.com/mac/puppet-#{puppet_ver}.dmg"
+        on host, "curl -O http://downloads.puppetlabs.com/mac/facter-#{facter_ver}.dmg"
+        on host, "curl -O http://downloads.puppetlabs.com/mac/hiera-#{hiera_ver}.dmg"
+
+        on host, "hdiutil attach puppet-#{puppet_ver}.dmg"
+        on host, "hdiutil attach facter-#{facter_ver}.dmg"
+        on host, "hdiutil attach hiera-#{hiera_ver}.dmg"
+
+        on host, "installer -pkg /Volumes/puppet-#{puppet_ver}/puppet-#{puppet_ver}.pkg -target /"
+        on host, "installer -pkg /Volumes/facter-#{facter_ver}/facter-#{facter_ver}.pkg -target /"
+        on host, "installer -pkg /Volumes/hiera-#{hiera_ver}/hiera-#{hiera_ver}.pkg -target /"
+      end
+
+      # Installs Puppet and dependencies from gem
+      #
+      # @param [Host] host The host to install packages on
+      # @param [Hash{Symbol=>String}] opts An options hash
+      # @option opts [String] :version The version of Puppet to install, if nil installs latest
+      # @option opts [String] :facter_version The version of Facter to install, if nil installs latest
+      # @option opts [String] :hiera_version The version of Hiera to install, if nil installs latest
+      # 
+      # @return nil
+      # @raise [StandardError] if gem does not exist on target host
+      # @api private
+      def install_puppet_from_gem( host, opts )
+        if host.check_for_package( 'gem' )
+          if opts[:facter_version]
+            on host, "gem install facter -v#{opts[:facter_version]}"
+          end
+          if opts[:hiera_version]
+            on host, "gem install hiera -v#{opts[:hiera_version]}"
+          end
+          ver_cmd = opts[:version] ? "-v#{opts[:version]}" : ''
+          on host, "gem install puppet #{ver_cmd}"
+        else
+          raise "install_puppet() called with default_action 'gem_install' but program `gem' not installed on #{host.name}"
+        end
+      end
+
       #Install PE based upon host configuration and options
       # @example
       #  install_pe

data/lib/beaker/host.rb

@@ -12,7 +12,7 @@ module Beaker
 
     class CommandFailure < StandardError; end
 
-    # This class providers array syntax for using puppet --configprint on a host
+    # This class provides array syntax for using puppet --configprint on a host
     class PuppetConfigReader
       def initialize(host, command)
         @host = host
@@ -158,7 +158,7 @@ module Beaker
     def connection
       @connection ||= SshConnection.connect( reachable_name,
                                              self['user'],
-                                             self['ssh'] )
+                                             self['ssh'], { :logger => @logger } )
     end
 
     def close
@@ -186,7 +186,10 @@ module Beaker
         seconds = Benchmark.realtime {
           result = connection.execute(cmdline, options, output_callback)
         }
-        @logger.debug "\n#{log_prefix} executed in %0.2f seconds" % seconds
+
+        if not options[:silent]
+          @logger.debug "\n#{log_prefix} executed in %0.2f seconds" % seconds
+        end
 
         unless options[:silent]
           # What?