beaker 1.7.0 → 1.8.0

data/lib/beaker/answers/version30.rb

@@ -205,6 +205,7 @@ module Beaker
           else
             the_answers[h.name] = host_answers(h, master_certname, master, database, dashboard, options)
           end
+          h[:answers] = the_answers[h.name]
         end
         return the_answers
       end

data/lib/beaker/answers/version32.rb

@@ -21,7 +21,9 @@ module Beaker
           # awesome.
           the_answers[dashboard.name][:q_upgrade_with_unknown_disk_space] = 'y'
         end
-
+        hosts.each do |h|
+          h[:answers] = the_answers[h.name]
+        end
         return the_answers
       end
     end

data/lib/beaker/dsl/helpers.rb

@@ -70,7 +70,10 @@ module Beaker
       # @raise  [FailTest] Raises an exception if *command* obviously fails.
       def on(host, command, opts = {}, &block)
         unless command.is_a? Command
-          cmd_opts = opts[:environment] ? { 'ENV' => opts.delete(:environment) } : Hash.new
+          cmd_opts = {}
+          if opts[:environment]
+            cmd_opts['ENV'] = opts[:environment]
+          end
           command = Command.new(command.to_s, [], cmd_opts)
         end
         if host.is_a? String or host.is_a? Symbol
@@ -82,7 +85,16 @@ module Beaker
           @result = host.exec(command, opts)
 
           # Also, let additional checking be performed by the caller.
-          yield self if block_given?
+          if block_given?
+            case block.arity
+              #block with arity of 0, just hand back yourself
+              when 0
+                yield self
+              #block with arity of 1 or greater, hand back the result object
+              else 
+                yield @result
+            end
+          end
 
           return @result
         end
@@ -453,7 +465,8 @@ module Beaker
       # @api dsl
       def with_puppet_running_on host, conf_opts, testdir = host.tmpdir(File.basename(@path)), &block
         raise(ArgumentError, "with_puppet_running_on's conf_opts must be a Hash. You provided a #{conf_opts.class}: '#{conf_opts}'") if !conf_opts.kind_of?(Hash)
-        cmdline_args = conf_opts.delete(:__commandline_args__)
+        cmdline_args = conf_opts[:__commandline_args__]
+        conf_opts = conf_opts.reject { |k,v| k == :__commandline_args__ }
 
         begin
           backup_file = backup_the_file(host, host['puppetpath'], testdir, 'puppet.conf')
@@ -486,6 +499,14 @@ module Beaker
             end
 
           rescue Exception => teardown_exception
+            begin
+              if !host.is_pe?
+                dump_puppet_log(host)
+              end
+            rescue Exception => dumping_exception
+              logger.error("Raised during attempt to dump puppet logs: #{dumping_exception}")
+            end
+
             if original_exception
               logger.error("Raised during attempt to teardown with_puppet_running_on: #{teardown_exception}\n---\n")
               raise original_exception

data/lib/beaker/dsl/install_utils.rb

@@ -453,10 +453,10 @@ module Beaker
         hosts.each do |host|
           host['pe_dir'] ||= options[:pe_dir]
           if host['platform'] =~ /windows/
-            host['pe_ver'] = host['pe_ver'] || 
+            host['pe_ver'] = host['pe_ver'] || options['pe_ver'] ||
               Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir], options[:pe_version_file_win])
           else
-            host['pe_ver'] = host['pe_ver'] || 
+            host['pe_ver'] = host['pe_ver'] || options['pe_ver'] ||
               Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir], options[:pe_version_file])
           end
         end
@@ -478,9 +478,11 @@ module Beaker
         hosts.each do |host|
           host['pe_dir'] = host['pe_upgrade_dir'] || path
           if host['platform'] =~ /windows/
-            host['pe_ver'] = host['pe_upgrade_ver'] || Options::PEVersionScraper.load_pe_version(host['pe_dir'], options[:pe_version_file_win])
+            host['pe_ver'] = host['pe_upgrade_ver'] || options['pe_upgrade_ver'] || 
+              Options::PEVersionScraper.load_pe_version(host['pe_dir'], options[:pe_version_file_win])
           else
-            host['pe_ver'] = host['pe_upgrade_ver'] || Options::PEVersionScraper.load_pe_version(host['pe_dir'], options[:pe_version_file])
+            host['pe_ver'] = host['pe_upgrade_ver'] || options['pe_upgrade_ver'] ||
+              Options::PEVersionScraper.load_pe_version(host['pe_dir'], options[:pe_version_file])
           end
           if version_is_less(host['pe_ver'], '3.0')
             host['pe_installer'] ||= 'puppet-enterprise-upgrader'

data/lib/beaker/host.rb

@@ -180,8 +180,7 @@ module Beaker
           # exit codes at the host level and then raising...
           # is it necessary to break execution??
           unless result.exit_code_in?(Array(options[:acceptable_exit_codes] || 0))
-            limit = 10
-            raise CommandFailure, "Host '#{self}' exited with #{result.exit_code} running:\n #{cmdline}\nLast #{limit} lines of output were:\n#{result.formatted_output(limit)}"
+            raise CommandFailure, "Host '#{self}' exited with #{result.exit_code} running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"
           end
         end
         # Danger, so we have to return this result?

data/lib/beaker/hypervisor/fusion.rb

@@ -11,6 +11,10 @@ module Beaker
       @logger = options[:logger]
       @options = options
       @fusion_hosts = fusion_hosts
+      #check preconditions for fusion
+      @fusion_hosts.each do |host|
+        raise "You must specify a snapshot for Fusion instances, no snapshot defined for #{host.name}!" unless host["snapshot"]
+      end
       @fission = Fission::VM
     end
 
@@ -23,10 +27,14 @@ module Beaker
         vm = @fission.new vm_name
         raise "Could not find VM '#{vm_name}' for #{host.name}!" unless vm.exists?
 
-        available_snapshots = vm.snapshots.data.sort.join(", ")
+        vm_snapshots = vm.snapshots.data
+        if vm_snapshots.nil? or vm_snapshots.empty?
+          raise "No snapshots available for VM #{host.name} (vmname: '#{vm_name}')" 
+        end
+
+        available_snapshots = vm_snapshots.sort.join(", ")
         @logger.notify "Available snapshots for #{host.name}: #{available_snapshots}"
         snap_name = host["snapshot"] 
-        raise "No snapshot specified for #{host.name}" unless snap_name
         raise "Could not find snapshot '#{snap_name}' for host #{host.name}!" unless vm.snapshots.data.include? snap_name
 
         @logger.notify "Reverting #{host.name} to snapshot '#{snap_name}'"

data/lib/beaker/hypervisor/vcloud_pooled.rb

@@ -55,6 +55,9 @@ module Beaker
       start = Time.now
       try = 1
       @vcloud_hosts.each_with_index do |h, i|
+        if not h['template']
+          raise ArgumentError, "You must specify a template name for #{h}"
+        end
         if h['template'] =~ /\//
           templatefolders = h['template'].split('/')
           h['template'] = templatefolders.pop

data/lib/beaker/options/parser.rb

@@ -5,14 +5,12 @@ module Beaker
     #An Object that parses, merges and normalizes all supported Beaker options and arguments
     class Parser
       GITREPO      = 'git://github.com/puppetlabs'
-      #These options can have the form of arg1,arg2 or [arg] or just arg, 
+      #These options can have the form of arg1,arg2 or [arg] or just arg,
       #should default to []
       LONG_OPTS    = [:helper, :load_path, :tests, :pre_suite, :post_suite, :install, :modules]
       #These options expand out into an array of .rb files
       RB_FILE_OPTS = [:tests, :pre_suite, :post_suite]
 
-      PLATFORMS = /^(centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el)\-.+\-.+$/
-
       PARSE_ERROR = if RUBY_VERSION > '1.8.7'; then Psych::SyntaxError; else ArgumentError; end
 
       #The OptionsHash of all parsed options
@@ -41,7 +39,7 @@ module Beaker
       # or can become an array of multiple values by splitting arg over ','.  If argument is already an
       # array that array is returned untouched.
       # @example
-      #   split_arg([1, 2, 3]) == [1, 2, 3] 
+      #   split_arg([1, 2, 3]) == [1, 2, 3]
       #   split_arg(1) == [1]
       #   split_arg("1,2") == ["1", "2"]
       #   split_arg(nil) == []
@@ -71,9 +69,9 @@ module Beaker
         files = []
         if not paths.empty?
           paths.each do |root|
-            if File.file? root then
+            if File.file?(root)
               files << root
-            else
+            elsif File.directory?(root) #expand and explore
               discover_files = Dir.glob(
                 File.join(root, "**/*.rb")
               ).select { |f| File.file?(f) }
@@ -81,6 +79,8 @@ module Beaker
                 parser_error "empty directory used as an option (#{root})!"
               end
               files += discover_files.sort
+            else #not a file, not a directory, not nothin'
+              parser_error "#{root} used as a file option but is not a file or directory!"
             end
           end
         end
@@ -93,9 +93,9 @@ module Beaker
       #Converts array of paths into array of fully qualified git repo URLS with expanded keywords
       #
       #Supports the following keywords
-      #  PUPPET 
+      #  PUPPET
       #  FACTER
-      #  HIERA 
+      #  HIERA
       #  HIERA-PUPPET
       #@example
       #  opts = ["PUPPET/3.1"]
@@ -142,7 +142,7 @@ module Beaker
         #NOTE on argument precedence:
         #
         # Will use env, then hosts/config file, then command line, then file options
-        # 
+        #
         @options = Beaker::Options::Presets.presets
         cmd_line_options = @command_line_parser.parse!(args)
         file_options = Beaker::Options::OptionsFileParser.parse_options_file(cmd_line_options[:options_file])
@@ -150,7 +150,7 @@ module Beaker
         #   overwrite file options with command line options
         cmd_line_and_file_options = file_options.merge(cmd_line_options)
         # merge command line and file options with defaults
-        #   overwrite defaults with command line and file options 
+        #   overwrite defaults with command line and file options
         @options = @options.merge(cmd_line_and_file_options)
 
         if not @options[:help] and not @options[:version]
@@ -206,9 +206,7 @@ module Beaker
           if not @options['HOSTS'][name]['platform']
             parser_error "Host #{name} does not have a platform specified"
           else
-            if not @options['HOSTS'][name]['platform'] =~ PLATFORMS
-              parser_error "Host #{name} is on unsupported platform #{@options['HOSTS'][name]['platform']}"
-            end
+            @options['HOSTS'][name]['platform'] = Platform.new(@options['HOSTS'][name]['platform'])
           end
         end
 
@@ -231,8 +229,8 @@ module Beaker
           else
             @options[opt] = []
           end
-        end 
- 
+        end
+
         #check for valid type
         if @options[:type] !~ /(pe)|(git)|(foss)/
           parser_error "--type must be one of pe, git, or foss, not '#{@options[:type]}'"
@@ -240,7 +238,7 @@ module Beaker
 
         #check for valid fail mode
         if @options[:fail_mode] !~ /stop|fast|slow/
-          parser_error "--fail-mode must be one of fast or slow, not '#{@options[:fail_mode]}'" 
+          parser_error "--fail-mode must be one of fast or slow, not '#{@options[:fail_mode]}'"
         end
 
         #check for valid preserve_hosts option
@@ -249,8 +247,8 @@ module Beaker
         end
 
         #check for config files necessary for different hypervisors
-        hypervisors = [] 
-        @options[:HOSTS].each_key do |name|  
+        hypervisors = []
+        @options[:HOSTS].each_key do |name|
           hypervisors << @options[:HOSTS][name][:hypervisor].to_s
         end
         hypervisors.uniq!
@@ -266,7 +264,7 @@ module Beaker
         #check that roles of hosts make sense
         # - must be one and only one master
         roles = []
-        @options[:HOSTS].each_key do |name|  
+        @options[:HOSTS].each_key do |name|
           roles << @options[:HOSTS][name][:roles]
         end
         master = 0
@@ -299,8 +297,8 @@ module Beaker
       # @api private
       def test_host_roles(host_name, host_hash)
         host_roles = host_hash[:roles]
-        if (host_roles - ['agent']).size != 0
-          parser_error "#{host_hash[:platform].to_s} box '#{host_name}' can only have role 'agent', has roles #{host_roles.to_s}"
+        if !(host_roles & ['master', 'database', 'dashboard']).empty?
+          parser_error "#{host_hash[:platform].to_s} box '#{host_name}' may not have roles 'master', 'dashboard', or 'database'; it has roles #{host_roles.to_s}"
         end
       end
 

data/lib/beaker/options/presets.rb

@@ -8,7 +8,7 @@ module Beaker
       # 
       # Currently supports:
       #
-      #   consoleport, IS_PE, pe_dist_dir, pe_version_file, pe_version_file_win
+      #   consoleport, IS_PE, pe_dist_dir, pe_version_file, pe_version_file_win, pe_ver
       #
       # @return [OptionsHash] The supported environment variables in an OptionsHash,
       #                       empty or nil environment variables are removed from the OptionsHash
@@ -20,6 +20,7 @@ module Beaker
           :pe_dir => ENV['pe_dist_dir'],
           :pe_version_file => ENV['pe_version_file'],
           :pe_version_file_win => ENV['pe_version_file'],
+          :pe_ver => ENV['pe_ver']
         }.delete_if {|key, value| value.nil? or value.empty? })
       end
 
@@ -30,6 +31,7 @@ module Beaker
         h = Beaker::Options::OptionsHash.new
         h.merge({
           :log_level => 'verbose',
+          :trace_limit => 10,
           :hosts_file => 'sample.cfg',
           :options_file => nil,
           :type => 'pe',

data/lib/beaker/platform.rb

@@ -0,0 +1,59 @@
+module Beaker
+  class Platform < String
+    #supported platforms
+    PLATFORMS = /^(centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el)\-.+\-.+$/
+
+    PLATFORM_VERSION_CODES = 
+      { :debian => { "wheezy"  => "7",
+                     "squeeze" => "6",
+                   },
+        :ubuntu => { "trusty"  => "1404", 
+                     "saucy"   => "1310",
+                     "raring"  => "1304",
+                     "quantal" => "1210",
+                     "precise" => "1204",
+                   },
+      }
+
+    def initialize(name)
+      if name !~ PLATFORMS
+        raise ArgumentError, "Unsupported platform name #{name}"
+      end
+      super
+    end
+
+    def with_version_codename
+      name, version, extra = self.split('-', 3)
+      PLATFORM_VERSION_CODES.each_key do |platform|
+        if name =~ /#{platform}/
+          PLATFORM_VERSION_CODES[platform].each do |version_codename, version_number|
+            #remove '.' from version number
+            if version.delete('.') =~ /#{version_number}/
+              version = version_codename
+              break
+            end
+          end
+          break
+        end
+      end
+      [name, version, extra].join('-')
+    end
+
+    def with_version_number
+      name, version, extra = self.split('-', 3)
+      PLATFORM_VERSION_CODES.each_key do |platform|
+        if name =~ /#{platform}/
+          PLATFORM_VERSION_CODES[platform].each do |version_codename, version_number|
+            if version =~ /#{version_codename}/
+              version = version_number
+              break
+            end
+          end
+          break
+        end
+      end
+      [name, version, extra].join('-')
+    end
+
+  end
+end

data/lib/beaker/ssh_connection.rb

@@ -174,6 +174,7 @@ module Beaker
       # Net::Scp always returns 0, so just set the return code to 0.
       result.exit_code = 0
 
+      result.finalize!
       return result
     end
 
@@ -192,6 +193,7 @@ module Beaker
       # Net::Scp always returns 0, so just set the return code to 0.
       result.exit_code = 0
 
+      result.finalize!
       result
     end
   end

data/lib/beaker/utils/ntp_control.rb

@@ -2,6 +2,8 @@ module Beaker
   module Utils
     class NTPControl
       NTPSERVER = 'pool.ntp.org'
+      SLEEPWAIT = 5
+      TRIES = 5
       def initialize(options, hosts)
         @options = options.dup
         @hosts = hosts
@@ -12,31 +14,44 @@ module Beaker
         @logger.notify "Update system time sync"
         @logger.notify "run ntpdate against NTP pool systems"
         @hosts.each do |host|
-          success=FALSE
-          if host['platform'].include? 'solaris-10'
-            host.exec(Command.new("sleep 10 && ntpdate -w #{NTPSERVER}"))
-          elsif host['platform'].include? 'windows'
+          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 /config /manualpeerlist:#{NTPSERVER} /syncfromflags:manual /update"))
             host.exec(Command.new("w32tm /resync"))
+            @logger.notify "NTP date succeeded on #{host}"
           else
-            count=0
-            until success do
-              count+=1
-              raise "ntp time sync failed after #{count} tries" and break if count > 3
-              if host.exec(Command.new("ntpdate -t 20 #{NTPSERVER}")).exit_code == 0 
-                success=TRUE 
+            case
+              when host['platform'] =~ /solaris-10/
+                ntp_command = "sleep 10 && ntpdate -w #{NTPSERVER}"
+              when host['platform'] =~ /sles-/
+                ntp_command = "sntp #{NTPSERVER}"
+              else
+                ntp_command = "ntpdate -t 20 #{NTPSERVER}"
+            end
+            success=false
+            try = 0
+            until try >= TRIES do
+              try += 1
+              if host.exec(Command.new(ntp_command), :acceptable_exit_codes => (0..255)).exit_code == 0
+                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
-            @logger.notify "NTP date succeeded after #{count} tries"
           end
         end
       rescue => e
         report_and_raise(@logger, e, "timesync (--ntp)")
       end
+
     end
   end
 end