beaker 2.15.1 → 2.16.0

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

@@ -45,6 +45,22 @@ module PSWindows::Exec
     ip
   end
 
+  # Attempt to ping the provided target hostname
+  # @param [String] target The hostname to ping
+  # @param [Integer] attempts Amount of times to attempt ping before giving up
+  # @return [Boolean] true of ping successful, overwise false
+  def ping target, attempts=5
+    try = 0
+    while try < attempts do
+      result = exec(Beaker::Command.new("ping -n 1 #{target}"), :accept_all_exit_codes => true)
+      if result.exit_code == 0
+        return true
+      end
+      try+=1
+    end
+    result.exit_code == 0
+  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

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

@@ -53,6 +53,22 @@ module Unix::Exec
     execute("mv #{orig} #{dest}")
   end
 
+  # Attempt to ping the provided target hostname
+  # @param [String] target The hostname to ping
+  # @param [Integer] attempts Amount of times to attempt ping before giving up
+  # @return [Boolean] true of ping successful, overwise false
+  def ping target, attempts=5
+    try = 0
+    while try < attempts do
+      result = exec(Beaker::Command.new("ping -c 1 #{target}"), :accept_all_exit_codes => true)
+      if result.exit_code == 0
+        return true
+      end
+      try+=1
+    end
+    result.exit_code == 0
+  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

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

@@ -61,6 +61,8 @@ module Unix::Pkg
     case self['platform']
       when /sles-/
         execute("zypper --non-interactive in #{name}", opts)
+      when /el-4/
+        @logger.debug("Package installation not supported on rhel4")
       when /cisco|fedora|centos|eos|el-/
         if version
           name = "#{name}-#{version}"

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

@@ -30,4 +30,21 @@ module Windows::Exec
     end
     ip
   end
+
+  # Attempt to ping the provided target hostname
+  # @param [String] target The hostname to ping
+  # @param [Integer] attempts Amount of times to attempt ping before giving up
+  # @return [Boolean] true of ping successful, overwise false
+  def ping target, attempts=5
+    try = 0
+    while try < attempts do
+      result = exec(Beaker::Command.new("ping -n 1 #{target}"), :accept_all_exit_codes => true)
+      if result.exit_code == 0
+        return true
+      end
+      try+=1
+    end
+    result.exit_code == 0
+  end
+
 end

data/lib/beaker/host_prebuilt_steps.rb

@@ -103,7 +103,7 @@ module Beaker
           check_and_install_packages_if_needed(host, PSWINDOWS_PACKAGES)
         when host['platform'] =~ /freebsd/
           check_and_install_packages_if_needed(host, FREEBSD_PACKAGES)
-        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus/
+        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
       end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -11,6 +11,7 @@ module Beaker
   # vendor API.
   class AwsSdk < Beaker::Hypervisor
     ZOMBIE = 3 #anything older than 3 hours is considered a zombie
+    PING_SECURITY_GROUP_NAME = 'beaker-ping'
 
     # Initialize AwsSdk hypervisor driver
     #
@@ -287,6 +288,8 @@ module Beaker
       end
 
       security_group = ensure_group(vpc || region, Beaker::EC2Helper.amiports(host))
+      #check if ping is enabled
+      ping_security_group = ensure_ping_group(vpc || region)
 
       msg = "aws-sdk: launching %p on %p using %p/%p%s" %
             [host.name, amitype, amisize, image_type,
@@ -297,7 +300,7 @@ module Beaker
         :image_id => image_id,
         :monitoring_enabled => true,
         :key_pair => ensure_key_pair(region),
-        :security_groups => [security_group],
+        :security_groups => [security_group, ping_security_group],
         :instance_type => amisize,
         :disable_api_termination => false,
         :instance_initiated_shutdown_behavior => "terminate",
@@ -522,13 +525,48 @@ module Beaker
     # @api private
     def enable_root(host)
       if host['user'] != 'root'
-        copy_ssh_to_root(host, @options)
-        enable_root_login(host, @options)
-        host['user'] = 'root'
+        if host['platform'] =~ /f5-/
+          enable_root_f5(host)
+        else
+          copy_ssh_to_root(host, @options)
+          enable_root_login(host, @options)
+          host['user'] = 'root'
+        end
         host.close
       end
     end
 
+    # Enables root access for a host on an f5 platform
+    # @note This method does not support other platforms
+    #
+    # @return nil
+    # @api private
+    def enable_root_f5(host)
+      for tries in 1..10
+        begin
+          #This command is problematic as the F5 is not always done loading
+          if host.exec(Command.new("modify sys db systemauth.disablerootlogin value false"), :acceptable_exit_codes => [0,1]).exit_code == 0 \
+              and host.exec(Command.new("modify sys global-settings gui-setup disabled"), :acceptable_exit_codes => [0,1]).exit_code == 0 \
+              and host.exec(Command.new("save sys config"), :acceptable_exit_codes => [0,1]).exit_code == 0
+            backoff_sleep(tries)
+            break
+          elsif tries == 10
+            raise "Instance was unable to be configured"
+          end
+        rescue Beaker::Host::CommandFailure => e
+          @logger.debug("Instance not yet configured (#{e})")
+        end
+        backoff_sleep(tries)
+      end
+      host['user'] = 'root'
+      host.close
+      sha256 = Digest::SHA256.new
+      password = sha256.hexdigest((1..50).map{(rand(86)+40).chr}.join.gsub(/\\/,'\&\&'))
+      host['ssh'] = {:password => password}
+      host.exec(Command.new("echo -e '#{password}\\n#{password}' | tmsh modify auth password admin"))
+      @logger.notify("f5: Configured admin password to be #{password}")
+    end
+
     # Set the hostname of all instances to be the hostname defined in the
     # beaker configuration.
     #
@@ -629,6 +667,25 @@ module Beaker
       "Beaker-#{Zlib.crc32(ports.inspect)}"
     end
 
+    # Return an existing group, or create new one
+    #
+    # Accepts a VPC as input for checking & creation.
+    #
+    # @param vpc [AWS::EC2::VPC] the AWS vpc control object
+    # @return [AWS::EC2::SecurityGroup] created security group
+    # @api private
+    def ensure_ping_group(vpc)
+      @logger.notify("aws-sdk: Ensure security group exists that enables ping, create if not")
+
+      group = vpc.security_groups.filter('group-name', PING_SECURITY_GROUP_NAME).first
+
+      if group.nil?
+        group = create_ping_group(vpc)
+      end
+
+      group
+    end
+
     # Return an existing group, or create new one
     #
     # Accepts a VPC as input for checking & creation.
@@ -650,6 +707,23 @@ module Beaker
       group
     end
 
+    # Create a new ping enabled security group
+    #
+    # Accepts a region or VPC for group creation.
+    #
+    # @param rv [AWS::EC2::Region, AWS::EC2::VPC] the AWS region or vpc control object
+    # @return [AWS::EC2::SecurityGroup] created security group
+    # @api private
+    def create_ping_group(rv)
+      @logger.notify("aws-sdk: Creating group #{PING_SECURITY_GROUP_NAME}")
+      group = rv.security_groups.create(PING_SECURITY_GROUP_NAME,
+                                        :description => "Custom Beaker security group to enable ping")
+
+      group.allow_ping
+
+      group
+    end
+
     # Create a new security group
     #
     # Accepts a region or VPC for group creation.

data/lib/beaker/junit.xsl

@@ -22,7 +22,33 @@
 
     <div class="container-fluid">
       <div class="page-header">
-        <h1>Beaker <small>Puppet Labs Automated Acceptance Testing System</small></h1>
+        <div class="row">
+          <div class="col-md-8">
+            <h1>Beaker <small>Puppet Labs Automated Acceptance Testing System</small></h1>
+          </div>
+          <xsl:variable name="page_active"><xsl:value-of select="meta_test_info/@page_active"/></xsl:variable>
+          <xsl:choose>
+            <xsl:when test="$page_active != 'no-links'">
+              <div class="col-md-2 pull-right">
+                <br />
+                <ol class="breadcrumb text-center" style="margin-bottom: 0px; margin-top: 20px;">
+                  <xsl:variable name="link_url"><xsl:value-of select="meta_test_info/@link_url"/></xsl:variable>
+                  <xsl:choose>
+                    <xsl:when test="$page_active = 'execution'">
+                      <li class="active">execution order</li>
+                      <li><a href="{$link_url}">performance order</a></li>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <li><a href="{$link_url}">execution order</a></li>
+                      <li class="active">performance order</li>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </ol>
+              </div>
+            </xsl:when>
+          </xsl:choose>
+
+        </div>
       </div>
 
       <!-- calculate overall stats for this run -->

data/lib/beaker/options/command_line_parser.rb

@@ -230,6 +230,12 @@ module Beaker
           opts.on '--exclude-tag TAGS', 'Run the set of tests that do not contain ANY of the provided single or command separated list of tags' do |value|
             @cmd_options[:tag_excludes] = value
           end
+
+          opts.on '--xml-time-order',
+                  'Output an additional JUnit XML file, sorted by execution time' do |bool|
+            @cmd_options[:xml_time_enabled] = bool
+          end
+
         end
 
       end

data/lib/beaker/options/presets.rb

@@ -23,6 +23,9 @@ module Beaker
         :consoleport          => ['BEAKER_CONSOLEPORT', 'consoleport'],
         :is_pe                => ['BEAKER_IS_PE', 'IS_PE'],
         :pe_dir               => ['BEAKER_PE_DIR', 'pe_dist_dir'],
+        :puppet_agent_version => ['BEAKER_PUPPET_AGENT_VERSION'],
+        :puppet_agent_sha     => ['BEAKER_PUPPET_AGENT_SHA'],
+        :puppet_collection    => ['BEAKER_PUPPET_COLLECTION'],
         :pe_version_file      => ['BEAKER_PE_VERSION_FILE', 'pe_version_file'],
         :pe_ver               => ['BEAKER_PE_VER', 'pe_ver'],
         :forge_host           => ['BEAKER_FORGE_HOST', 'forge_host'],
@@ -138,6 +141,8 @@ module Beaker
           :project_root           => File.expand_path(File.join(File.dirname(__FILE__), "../")),
           :xml_dir                => 'junit',
           :xml_file               => 'beaker_junit.xml',
+          :xml_time               => 'beaker_times.xml',
+          :xml_time_enabled       => false,
           :xml_stylesheet         => 'junit.xsl',
           :default_log_prefix     => 'beaker_logs',
           :log_dir                => 'log',

data/lib/beaker/platform.rb

@@ -3,7 +3,7 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(cisco|freebsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus)\-.+\-.+$/
+    PLATFORMS = /^(cisco|freebsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus|f5)\-.+\-.+$/
 
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
@@ -21,6 +21,11 @@ module Beaker
                      "precise" => "1204",
                      "lucid"   => "1004",
                    },
+        :osx =>    { "yosemite"  => "10.10",
+                     "mavericks" => "10.9",
+                     "1010"      => "10.10",
+                     "109"       => "10.9"
+                   }
       }
 
     # A string with the name of the platform.

data/lib/beaker/test_suite.rb

@@ -148,12 +148,35 @@ module Beaker
         @logger.notify "  Test Case #{test_case.path} #{test_reported}"
       end
 
-      def write_junit_xml(xml_file)
+      # Writes Junit XML of this {TestSuiteResult}
+      #
+      # @param [String] xml_file      Path to the XML file (from Beaker's running directory)
+      # @param [String] file_to_link  Path to the paired file that should be linked
+      #                               from this one (this is relative to the XML
+      #                               file itself, so it would just be the different
+      #                               file name if they're in the same directory)
+      # @param [Boolean] time_sort    Whether the test results should be output in
+      #                               order of time spent in the test, or in the
+      #                               order of test execution (default)
+      #
+      # @return nil
+      # @api private
+      def write_junit_xml(xml_file, file_to_link = nil, time_sort = false)
         stylesheet = File.join(@options[:project_root], @options[:xml_stylesheet])
 
         begin
           LoggerJunit.write_xml(xml_file, stylesheet) do |doc, suites|
 
+            meta_info = Nokogiri::XML::Node.new('meta_test_info', doc)
+            unless file_to_link.nil?
+              meta_info['page_active'] = time_sort ? 'performance' : 'execution'
+              meta_info['link_url'] = file_to_link
+            else
+              meta_info['page_active'] = 'no-links'
+              meta_info['link_url'] = ''
+            end
+            suites.add_child(meta_info)
+
             suite = Nokogiri::XML::Node.new('testsuite', doc)
             suite['name']     = @name
             suite['tests']    = test_count
@@ -172,7 +195,9 @@ module Beaker
             end
             suite.add_child(properties)
 
-            @test_cases.each do |test|
+            test_cases_to_report = @test_cases
+            test_cases_to_report = @test_cases.sort { |x,y| y.runtime <=> x.runtime } if time_sort
+            test_cases_to_report.each do |test|
               item = Nokogiri::XML::Node.new('testcase', doc)
               item['classname'] = File.dirname(test.path)
               item['name']      = File.basename(test.path)
@@ -309,8 +334,15 @@ module Beaker
       # of the suite – or, at least, making them highly confusing for anyone who
       # has not studied the implementation in detail. --daniel 2011-03-14
       @test_suite_results.summarize( Logger.new(log_path("#{name}-summary.txt", @options[:log_dated_dir]), STDOUT) )
-      @test_suite_results.write_junit_xml( log_path(@options[:xml_file], @options[:xml_dated_dir]) )
 
+      junit_file_log  = log_path(@options[:xml_file], @options[:xml_dated_dir])
+      if @options[:xml_time_enabled]
+        junit_file_time = log_path(@options[:xml_time], @options[:xml_dated_dir])
+        @test_suite_results.write_junit_xml( junit_file_log, @options[:xml_time] )
+        @test_suite_results.write_junit_xml( junit_file_time, @options[:xml_file], true )
+      else
+        @test_suite_results.write_junit_xml( junit_file_log )
+      end
       #All done with this run, remove run log
       @logger.remove_destination(run_log)
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.15.1'
+    STRING = '2.16.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -3,12 +3,51 @@ require 'spec_helper'
 module Beaker
   describe Answers do
     let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-    let( :options )     { Beaker::Options::Presets.new.presets }
+    let( :options )     { @options || Beaker::Options::Presets.new.presets }
     let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
                           basic_hosts[1]['platform'] = 'windows'
                           basic_hosts }
     let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
 
+    after :each do
+      ENV.delete('q_puppet_cloud_install')
+    end
+
+    it 'uses options[:answers] if they are set (override q_puppet_cloud_install for 3.8' do
+      @ver = '3.8'
+      options[:answers] = Beaker::Options::OptionsHash.new
+      options[:answers]['q_puppet_cloud_install'] = 'n'
+      opts = answers.instance_variable_get(:@options)
+      @answers = answers.answers
+      # confirm that the answers were correctly added to the answers object
+      expect(opts).to be_a_kind_of Beaker::Options::OptionsHash
+      expect(opts[:answers]['q_puppet_cloud_install']).to be == 'n'
+      expect(opts[:answers][:q_puppet_cloud_install]).to be == 'n'
+      hosts.each do |host|
+        if @answers[host.name]
+          expect( @answers[host.name][:q_puppet_cloud_install] ).to be == 'n'
+        end
+      end
+    end
+
+    it 'uses ENV[:q_*] if they are set (override q_puppet_cloud_install for 3.8' do
+      @ver = '3.8'
+      ENV['q_puppet_cloud_install'] = 'n'
+      @options = Beaker::Options::Parser.new.parse_args([])
+
+      opts = answers.instance_variable_get(:@options)
+      @answers = answers.answers
+      # confirm that the answers were correctly added to the answers object
+      expect(opts).to be_a_kind_of Beaker::Options::OptionsHash
+      expect(opts[:answers]['q_puppet_cloud_install']).to be == 'n'
+      expect(opts[:answers][:q_puppet_cloud_install]).to be == 'n'
+      hosts.each do |host|
+        if @answers[host.name]
+          expect( @answers[host.name][:q_puppet_cloud_install] ).to be == 'n'
+        end
+      end
+    end
+
     it 'generates 3.4 answers for 4.0 hosts' do
       @ver = '4.0'
       expect( answers ).to be_a_kind_of Version34
@@ -208,7 +247,7 @@ module Beaker
     it 'should add answers to the host objects' do
       answers = @answers
       hosts.each do |host|
-        expect( host[:answers] ).to be === answers[host.name]
+        expect( host[:answers] ).to be === @answers[host.name]
       end
     end
   end
@@ -459,9 +498,7 @@ module Beaker
 
     def test_answer_customization(answer_key, value_to_set)
       @ver = '3.0'
-      if not options[:answers]
-        options[:answers] = {}
-      end
+      options[:answers] ||= Beaker::Options::OptionsHash.new
       options[:answers][answer_key] = value_to_set
       host_answers = answers.answers['vm1']
       expect( host_answers[answer_key] ).to be === value_to_set