beaker 2.23.0 → 2.24.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzNiNDI1OTkwY2JmOWI1ZjBlYTM1ODk1YWFlODc1YzFiZWFiMDgzMw==
+    N2JhMzVjZDBiMDlmZmY5YTMwMmQwODI4OWE5OWEwOWEzM2Y0OWM0NA==
   data.tar.gz: !binary |-
-    NTBlMjYyNWI1MGE1ZjhjNTBjZjI5YWNjZTQzMzM3N2Q2ZmJiMzRmOQ==
+    NmVkNDllNTg5ZDU2MzAyMGRkNmU4NTI2NDcyMGE4NDA3MzUyNDFlNg==
 SHA512:
   metadata.gz: !binary |-
-    MWIzYmNmNmUwOTJkZjhiZjNhZjMyY2U1MGUxZTAxOGM4MTU4NzczYzQ3OWJm
-    ZWZiYTZhMmFjMDA5ZTJjODg3YjM2YWNiMzY4OGY1NzdhMmRhN2UzZTU0MDQz
-    MTFmYmYwYmQ2ODk5YmU1NDE5ODc5NWY0M2FhMmQ2ZmY1NzNmMjY=
+    MTNjYmZmZGYyZTQyMjlkZDk5OWZlYWViNDc1MTYwNTg2NDg5MWQ2ZTQxNTJh
+    MWU0MGYwMzgwMWU2MjU5OWIxMTlkMDAwMjVmZjM0ODNiNmEyYWMyNzczMzkz
+    N2FiYzA2Mjc3ZTdkODMwNjlkYmRjOGZkZDk2MThiZWJiMTQ0Zjk=
   data.tar.gz: !binary |-
-    NWJhMTY1ZmMwY2E5NjMxMjRiMGI5N2Y1NjdlZmFlNWM2YzNiMmE2ZDliYzVk
-    ZDE3MjVlYTk4Y2UyOTcwMjAwZDhhMGIyNmEyMWFhN2FlNGU5OGIyNzlkZGU5
-    OThlZDBmMTBhNWQyZmUwNzFmOTA2MDBlMzBkNWVlMjNlMTk3YzA=
+    ZWFiMjRiMGRkMzA0YTE2YjA2ZWY5YjcxOTQzMmE0MDIxMzQwZWFiYTEyMmJm
+    NTY4YmNiZDU1NWEyNzkzNjg5YThkMDdjN2YyMjNiMjBlZmNjNWZhMGE1YzQy
+    YjZiMGNkNWIwMjZkMjcyODhhMmE5YjQ2ZGNmYWE4NzA5ZGJjNTI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 9 Sep, 2015 (db33f827)](#LATEST)
+* [LATEST - 15 Sep, 2015 (96d9104d)](#LATEST)
+* [2.23.0 - 9 Sep, 2015 (2532324a)](#2.23.0)
 * [2.22.0 - 1 Sep, 2015 (96ec20a7)](#2.22.0)
 * [2.21.0 - 26 Aug, 2015 (40281eb2)](#2.21.0)
 * [2.20.0 - 17 Aug, 2015 (8a419e98)](#2.20.0)
@@ -95,7 +96,212 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 9 Sep, 2015 (db33f827)
+### <a name = "LATEST">LATEST - 15 Sep, 2015 (96d9104d)
+
+* (GEM) update beaker version to 2.24.0 (96d9104d)
+
+* Merge pull request #956 from kevpl/bkr531_osx_update (ca365d15)
+
+
+```
+Merge pull request #956 from kevpl/bkr531_osx_update
+
+(BKR-531) updated osx name structure to match RE changes
+```
+* (BKR-531) review clarifications & clean-up (308815d7)
+
+* Merge pull request #950 from anodelman/timeout (1a528f21)
+
+
+```
+Merge pull request #950 from anodelman/timeout
+
+(BKR-514) increase polling timeout when requesting vpool instances
+```
+* (BKR-531) updated osx name structure to match RE changes (f4512f99)
+
+* Merge pull request #949 from cybercom-finland/bkr-516/more-openstack-credentials-from-env (11243052)
+
+
+```
+Merge pull request #949 from cybercom-finland/bkr-516/more-openstack-credentials-from-env
+
+(BKR-516) Lookup more openstack credentials from ENV
+```
+* Merge pull request #953 from GeoffWilliams/docker_error_catch (5d79e90a)
+
+
+```
+Merge pull request #953 from GeoffWilliams/docker_error_catch
+
+(BKR-523) Beaker prints error message on exit when using docker containers
+```
+* Merge pull request #952 from GeoffWilliams/no_more_grey (c13914a0)
+
+
+```
+Merge pull request #952 from GeoffWilliams/no_more_grey
+
+(BKR-519) Beaker prints invisible messages in debug mode (black-on-bl…
+```
+* (BKR-523) Beaker prints error message on exit when using docker containers (ddd05816)
+
+
+```
+(BKR-523) Beaker prints error message on exit when using docker containers
+
+Capture the strange error message from docker (and all other internal docker errors) and display the message as a logged warning instead of a stack trace.  This will preven the message from causing a CI test failure as the exit status is now zero
+```
+* (BKR-519) Beaker prints invisible messages in debug mode (black-on-black) (20cfbdd2)
+
+
+```
+(BKR-519) Beaker prints invisible messages in debug mode (black-on-black)
+Use normal colour instead of bold as some terminals (mac) can't handle the grey without additional configuration
+```
+* Merge pull request #951 from johnduarte/aix-curl-opts (3b1fd835)
+
+
+```
+Merge pull request #951 from johnduarte/aix-curl-opts
+
+(BKR-520) Add curl options for AIX
+```
+* Merge pull request #945 from mcanevet/fix/BKR-506 (673ac239)
+
+
+```
+Merge pull request #945 from mcanevet/fix/BKR-506
+
+(BKR-506) Fix FQDN
+```
+* Merge pull request #915 from jstremick/feature/aws_credential_sources (e643f054)
+
+
+```
+Merge pull request #915 from jstremick/feature/aws_credential_sources
+
+BRK-431: Find AWS credentials from environment variables
+```
+* Merge pull request #946 from kevpl/bkr455_exitcodes_logging (b19d1238)
+
+
+```
+Merge pull request #946 from kevpl/bkr455_exitcodes_logging
+
+(BKR-455) added warning message for conflicting exit code handling
+```
+* Merge pull request #948 from cybercom-finland/bkr-515/host_name_prefix (8b8b2cc2)
+
+
+```
+Merge pull request #948 from cybercom-finland/bkr-515/host_name_prefix
+
+(BKR-515) add config option host_name_prefix
+```
+* (BKR-520) Add curl options for AIX (f6438338)
+
+
+```
+(BKR-520) Add curl options for AIX
+
+The curl command on AIX does not support the `-k flag`. This commit
+creates condition statements to replace the `-k` flag in the curl
+options with `--tlsv1` when the platform is AIX.
+```
+* (BKR-514) increase polling timeout when requesting vpool instances (05fa681e)
+
+
+```
+(BKR-514) increase polling timeout when requesting vpool instances
+
+- increase timeout to 15 minutes
+- write out failure message to get more information about why the pool
+  request failed
+```
+* Merge pull request #947 from anodelman/osx (9258e8ec)
+
+
+```
+Merge pull request #947 from anodelman/osx
+
+(BKR-482) Add support for OSX 10.11 El Capitan (x86_64)
+```
+* (BKR-482) Add support for OSX 10.11 El Capitan (x86_64) (439568c4)
+
+
+```
+(BKR-482) Add support for OSX 10.11 El Capitan (x86_64)
+
+- correctly turn on ssh user environment support
+- update platform list
+```
+* (BKR-455) added warning message for conflicting exit code handling (44f55339)
+
+* Merge pull request #944 from puppetlabs/bkr-505/fix-broken-confine_block-behavior (a5cd36a1)
+
+
+```
+Merge pull request #944 from puppetlabs/bkr-505/fix-broken-confine_block-behavior
+
+(BKR-505) rescue `SkipTest` in `confine_block`
+```
+* (BKR-505) Add acceptance tests for #confine_block (0d73ff10)
+
+
+```
+(BKR-505) Add acceptance tests for #confine_block
+
+These tests fail when the code patch in this PR is not present, and
+succeed when the patch is present.
+```
+* (BKR-515) Add config option host_name_prefix (66cbd292)
+
+
+```
+(BKR-515) Add config option host_name_prefix
+
+This helps to identify hosts if you do not destroy them.
+
+If defined, hostname is prefixed.
+```
+* (BKR-516) Lookup more openstack credentials from ENV (34b4054a)
+
+
+```
+(BKR-516) Lookup more openstack credentials from ENV
+
+Add support to configure openstack via these environment
+variables (environment variable name, configuration option)
+- OS_KEYNAME openstack_keyname
+- OS_NETWORK openstack_network
+- OS_REGION  openstack_region
+```
+* (BKR-506) Fix FQDN (ab283113)
+
+* (BKR-505) rescue SkipTest in confine_block (efd0c3e3)
+
+
+```
+(BKR-505) rescue SkipTest in confine_block
+
+Prior to this, use of confine_block would result in all following code in the
+test case being skipped in situations where the host list had no matches for
+the confine_block.  The entire purpose of confine_block is to limit the scope
+of the confine to the passed block.
+
+Also, ensure and rescue at the method level do not require an additional
+wrapping begin..end block.
+```
+* BRK-431: Correct env variable names and prefix (3026cd88)
+
+* BRK-431: Corrected AWS keys used in .fog file (f43460e6)
+
+* BRK-431: Find AWS credentials from environment variables (5e085999)
+
+### <a name = "2.23.0">2.23.0 - 9 Sep, 2015 (2532324a)
+
+* (HISTORY) update beaker history for gem release 2.23.0 (2532324a)
 
 * (GEM) update beaker version to 2.23.0 (db33f827)
 

data/acceptance/tests/base/dsl/structure_test.rb

@@ -0,0 +1,63 @@
+test_name "dsl::structure" do
+  step "#confine_block runs specified block on matching hosts" do
+    begin
+      @in_confine = 0
+      confine_block :to, :platform => default["platform"] do
+        @in_confine +=1
+      end
+
+      assert_equal 1, @in_confine, "#confine_block did not run the supplied block"
+
+    rescue Beaker::DSL::Outcomes::SkipTest => e
+      fail "#confine_block raised unexpected SkipTest exception: #{e}"
+    end
+  end
+
+  step "#confine_block leaves hosts array intact after running block on matching hosts" do
+    begin
+      previous_hosts = hosts.dup
+
+      @in_confine = 0
+      confine_block :to, :platform => default["platform"] do
+        @in_confine +=1
+      end
+
+      assert_equal 1, @in_confine, "#confine_block did not run the supplied block"
+      assert_equal hosts.dup, hosts, "#confine_block did not preserve the hosts array"
+
+    rescue Beaker::DSL::Outcomes::SkipTest => e
+      fail "#confine_block raised unexpected SkipTest exception: #{e}"
+    end
+  end
+
+  step "#confine_block will not run specified block on non-matching hosts" do
+    begin
+      @in_confine = 0
+      confine_block :except, :platform => default["platform"] do
+        @in_confine +=1
+      end
+
+      assert_equal 0, @in_confine, "#confine_block did not skip the supplied block"
+
+    rescue Beaker::DSL::Outcomes::SkipTest => e
+      fail "#confine_block raised unexpected SkipTest exception: #{e}"
+    end
+  end
+
+  step "#confine_block leaves hosts array intact after skipping block on non-matching hosts" do
+    begin
+      previous_hosts = hosts.dup
+
+      @in_confine = 0
+      confine_block :except, :platform => default["platform"] do
+        @in_confine +=1
+      end
+
+      assert_equal 0, @in_confine, "#confine_block did not skip the supplied block"
+      assert_equal hosts.dup, hosts, "#confine_block did not preserve the hosts array"
+
+    rescue Beaker::DSL::Outcomes::SkipTest => e
+      fail "#confine_block raised unexpected SkipTest exception: #{e}"
+    end
+  end
+end

data/lib/beaker/dsl/helpers/puppet_helpers.rb

@@ -658,7 +658,12 @@ module Beaker
         #wait for a given host to appear in the dashboard
         def wait_for_host_in_dashboard(host)
           hostname = host.node_name
-          retry_on(dashboard, "! curl --tlsv1 -k -I https://#{dashboard}/nodes/#{hostname} | grep '404 Not Found'")
+          if host['platform'] =~ /aix/ then
+            curl_opts = '--tlsv1 -I'
+          else
+            curl_opts = '--tlsv1 -k -I'
+          end
+          retry_on(dashboard, "! curl #{curl_opts} https://#{dashboard}/nodes/#{hostname} | grep '404 Not Found'")
         end
 
         # Ensure the host has requested a cert, then sign it

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -1130,14 +1130,23 @@ module Beaker
               mac_pkg_name = "puppet-agent-#{opts[:puppet_agent_version]}"
               version = version[0,2] + '.' + version[2,2] if (variant =~ /osx/ && !version.include?("."))
               path_chunk = ''
-              # new hotness
+              # newest hotness
               path_chunk = "apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
               release_path << path_chunk
-              release_file = "#{mac_pkg_name}-1.#{codename}.dmg"
-              if not link_exists?("#{release_path}/") # oops, try the old stuff
+              # moved to doing this when 'el capitan' came out & the objection was
+              # raised that the code name wasn't a fact, & as such can be hard to script
+              # example: puppet-agent-0.1.0-1.osx10.9.dmg
+              release_file = "#{mac_pkg_name}-1.osx#{version}.dmg"
+              if not link_exists?("#{release_path}/#{release_file}") # new hotness
+                # little older change involved the code name as only difference from above
+                # example: puppet-agent-0.1.0-1.mavericks.dmg
+                release_file = "#{mac_pkg_name}-1.#{codename}.dmg"
+              end
+              if not link_exists?("#{release_path}/#{release_file}") # oops, try the old stuff
                 # the old school
                 release_path.chomp!(path_chunk) #remove chunk that didn't work
                 release_path << "apple/#{opts[:puppet_collection]}"
+                # example: puppet-agent-0.1.0-osx-10.9-x86_64.dmg
                 release_file = "#{mac_pkg_name}-#{variant}-#{version}-x86_64.dmg"
               end
             when /^solaris$/

data/lib/beaker/dsl/install_utils/pe_utils.rb

@@ -91,7 +91,12 @@ module Beaker
             end
 
             pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -x' : ''
-            "cd #{host['working_dir']} && curl --tlsv1 -kO https://#{master}:8140/packages/#{version}/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
+            if host['platform'] =~ /aix/ then
+              curl_opts = '--tlsv1 -O'
+            else
+              curl_opts = '--tlsv1 -kO'
+            end
+            "cd #{host['working_dir']} && curl #{curl_opts} https://#{master}:8140/packages/#{version}/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
           elsif host['platform'] =~ /osx/
             version = host['pe_ver'] || opts[:pe_ver]
             pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -verboseR' : ''

data/lib/beaker/dsl/structure.rb

@@ -208,16 +208,15 @@ module Beaker
       #
       # @see #confine
       def confine_block(type, criteria, host_array = nil, &block)
-        begin
-          host_array = Array( host_array || hosts )
-          original_hosts = self.hosts.dup
-          confine(type, criteria, host_array)
+        host_array = Array( host_array || hosts )
+        original_hosts = self.hosts.dup
+        confine(type, criteria, host_array)
 
-          yield
+        yield
 
-        ensure
-          self.hosts = original_hosts
-        end
+      rescue Beaker::DSL::Outcomes::SkipTest
+      ensure
+        self.hosts = original_hosts
       end
 
       # Sets tags on the current {Beaker::TestCase}, and skips testing

data/lib/beaker/host.rb

@@ -300,6 +300,9 @@ module Beaker
           # No, TestCase has the knowledge about whether its failed, checking acceptable
           # exit codes at the host level and then raising...
           # is it necessary to break execution??
+          if options[:accept_all_exit_codes] && options[:acceptable_exit_codes]
+            @logger.warn ":accept_all_exit_codes & :acceptable_exit_codes set. :accept_all_exit_codes overrides, but they shouldn't both be set at once"
+          end
           if !options[:accept_all_exit_codes] && !result.exit_code_in?(Array(options[:acceptable_exit_codes] || [0, nil]))
             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

data/lib/beaker/host_prebuilt_steps.rb

@@ -25,6 +25,7 @@ module Beaker
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
     ROOT_KEYS_SYNC_CMD = "curl -k -o - -L #{ROOT_KEYS_SCRIPT} | %s"
+    ROOT_KEYS_SYNC_CMD_AIX = "curl --tlsv1 -o - -L #{ROOT_KEYS_SCRIPT} | %s"
     APT_CFG = %q{ Acquire::http::Proxy "http://proxy.puppetlabs.net:3128/"; }
     IPS_PKG_REPO="http://solaris-11-internal-repo.delivery.puppetlabs.net"
 
@@ -143,6 +144,8 @@ module Beaker
         # Allow all exit code, as this operation is unlikely to cause problems if it fails.
         if host['platform'] =~ /solaris|eos/
           host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "bash"), :accept_all_exit_codes => true)
+        elsif host['platform'] =~ /aix/
+          host.exec(Command.new(ROOT_KEYS_SYNC_CMD_AIX % "env PATH=/usr/gnu/bin:$PATH bash"), :accept_all_exit_codes => true)
         else
           host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "env PATH=/usr/gnu/bin:$PATH bash"), :accept_all_exit_codes => true)
         end
@@ -283,8 +286,12 @@ module Beaker
           search = $1
         end
       }
-      return domain if domain
-      return search if search
+      return_value ||= domain
+      return_value ||= search
+
+      if return_value
+        return_value.gsub(/\.$/, '')
+      end
     end
 
     #Determine the ip address of the provided host
@@ -519,6 +526,10 @@ module Beaker
           else
             #nothing to do here
           end
+        when /osx-10\.*11/
+          host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /private/etc/ssh/sshd_config"))
+          host.exec(Command.new("launchctl unload /System/Library/LaunchDaemons/ssh.plist"))
+          host.exec(Command.new("launchctl load /System/Library/LaunchDaemons/ssh.plist"))
         when /osx/
           host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/sshd_config"))
           host.exec(Command.new("launchctl unload /System/Library/LaunchDaemons/ssh.plist"))

data/lib/beaker/hypervisor.rb

@@ -16,6 +16,7 @@ module Beaker
     #                     blimpy, vcloud or vagrant
     #@param [Array<Host>] hosts_to_provision The hosts to be provisioned with the selected hypervisor
     #@param [Hash] options options Options to alter execution
+    #@option options [String] :host_name_prefix (nil) Prefix host name if set
     def self.create(type, hosts_to_provision, options)
       @logger = options[:logger]
       @logger.notify("Beaker::Hypervisor, found some #{type} boxes to create")
@@ -128,8 +129,13 @@ module Beaker
     end
 
     #Generate a random string composted of letter and numbers
+    #prefixed with value of {Beaker::Hypervisor::create} option :host_name_prefix
     def generate_host_name
-      CHARMAP[rand(25)] + (0...14).map{CHARMAP[rand(CHARMAP.length)]}.join
+      n = CHARMAP[rand(25)] + (0...14).map{CHARMAP[rand(CHARMAP.length)]}.join
+      if @options[:host_name_prefix]
+        return @options[:host_name_prefix] + n
+      end
+      n
     end
 
   end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -22,8 +22,8 @@ module Beaker
       @options = options
       @logger = options[:logger]
 
-      # Get fog credentials from the local .fog file
-      creds = load_fog_credentials(@options[:dot_fog])
+      # Get AWS credentials
+      creds = load_credentials()
 
       config = {
         :access_key_id => creds[:access_key],
@@ -800,6 +800,32 @@ module Beaker
       group
     end
 
+    # Return a hash containing AWS credentials
+    #
+    # @return [Hash<Symbol, String>] AWS credentials
+    # @api private
+    def load_credentials
+      return load_env_credentials unless load_env_credentials.empty?
+      load_fog_credentials(@options[:dot_fog])
+    end
+
+    # Return AWS credentials loaded from environment variables
+    #
+    # @param prefix [String] environment variable prefix
+    # @return [Hash<Symbol, String>] ec2 credentials
+    # @api private
+    def load_env_credentials(prefix='AWS')
+      provider = AWS::Core::CredentialProviders::ENVProvider.new prefix
+
+      if provider.set?
+        {
+          :access_key => provider.access_key_id,
+          :secret_key => provider.secret_access_key,
+        }
+      else
+        {}
+      end
+    end
     # Return a hash containing the fog credentials for EC2
     #
     # @param dot_fog [String] dot fog path
@@ -807,16 +833,15 @@ module Beaker
     # @api private
     def load_fog_credentials(dot_fog = '.fog')
       fog = YAML.load_file( dot_fog )
-
       default = fog[:default]
 
-      creds = {}
-      creds[:access_key] = default[:aws_access_key_id]
-      creds[:secret_key] = default[:aws_secret_access_key]
-      raise "You must specify an aws_access_key_id in your .fog file (#{dot_fog}) for ec2 instances!" unless creds[:access_key]
-      raise "You must specify an aws_secret_access_key in your .fog file (#{dot_fog}) for ec2 instances!" unless creds[:secret_key]
+      raise "You must specify an aws_access_key_id in your .fog file (#{dot_fog}) for ec2 instances!" unless default[:aws_access_key_id]
+      raise "You must specify an aws_secret_access_key in your .fog file (#{dot_fog}) for ec2 instances!" unless default[:aws_secret_access_key]
 
-      creds
+      {
+        :access_key => default[:aws_access_key_id],
+        :secret_key => default[:aws_secret_access_key],
+      }
     end
   end
 end

data/lib/beaker/hypervisor/docker.rb

@@ -137,6 +137,8 @@ module Beaker
             image.delete
           rescue Excon::Errors::ClientError => e
             @logger.warn("deletion of image #{image.id} failed: #{e.response.body}")
+          rescue ::Docker::Error::DockerError => e
+            @logger.warn("deletion of image #{image.id} caused internal Docker error: #{e.message}")
           end
         end
       end

data/lib/beaker/hypervisor/vmpooler.rb

@@ -127,8 +127,9 @@ module Beaker
           raise "Vmpooler.provision - requested host set not available"
         end
       rescue JSON::ParserError, RuntimeError, *SSH_EXCEPTIONS => e
+        @logger.debug "Failed vmpooler provision: #{e.class} : #{e.message}"
         if waited <= @options[:timeout].to_i
-          @logger.debug("Retrying provision for vmpooler host after waiting #{wait} second(s) (failed with #{e.class})")
+          @logger.debug("Retrying provision for vmpooler host after waiting #{wait} second(s)")
           sleep wait
           waited += wait
           last_wait, wait = wait, last_wait + wait

data/lib/beaker/logger.rb

@@ -18,7 +18,7 @@ module Beaker
     MAGENTA        = "\e[00;35m"
     CYAN           = "\e[00;36m"
     WHITE          = "\e[00;37m"
-    GREY           = "\e[01;30m"
+    GREY           = "\e[00;00m"  # Some terms can't handle grey, use normal
     BRIGHT_RED     = "\e[01;31m"
     BRIGHT_GREEN   = "\e[01;32m"
     BRIGHT_YELLOW  = "\e[01;33m"

data/lib/beaker/options/presets.rb

@@ -125,6 +125,9 @@ module Beaker
           :openstack_username     => ENV['OS_USERNAME'],
           :openstack_auth_url     => "#{ENV['OS_AUTH_URL']}/tokens",
           :openstack_tenant       => ENV['OS_TENANT_NAME'],
+          :openstack_keyname      => ENV['OS_KEYNAME'],
+          :openstack_network      => ENV['OS_NETWORK'],
+          :openstack_region       => ENV['OS_REGION'],
           :jenkins_build_url      => nil,
           :validate               => true,
           :configure              => true,
@@ -151,7 +154,7 @@ module Beaker
           :dry_run                => false,
           :tag_includes           => '',
           :tag_excludes           => '',
-          :timeout                => 300,
+          :timeout                => 900, # 15 minutes
           :fail_mode              => 'slow',
           :accept_all_exit_codes  => false,
           :timesync               => false,
@@ -169,6 +172,7 @@ module Beaker
           :pe_version_file        => 'LATEST',
           :pe_version_file_win    => 'LATEST-win',
           :host_env               => {},
+          :host_name_prefix       => nil,
           :ssh_env_file           => '~/.ssh/environment',
           :profile_d_env_file     => '/etc/profile.d/beaker_env.sh',
           :dot_fog                => File.join(ENV['HOME'], '.fog'),

data/lib/beaker/platform.rb

@@ -21,7 +21,8 @@ module Beaker
                      "precise" => "1204",
                      "lucid"   => "1004",
                    },
-        :osx =>    { "yosemite"  => "1010",
+        :osx =>    { "elcapitan" => "1011",
+                     "yosemite"  => "1010",
                      "mavericks" => "109",
                    }
       }

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.23.0'
+    STRING = '2.24.0'
   end
 end

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -877,24 +877,35 @@ describe ClassMixedWithDSLInstallUtils do
       subject.install_puppet_agent_dev_repo_on( host, opts )
     end
 
+    it 'runs the correct install for osx platforms (newest link format)' do
+      platform = Object.new()
+      allow(platform).to receive(:to_array) { ['osx', '10.9', 'x86_64', 'mavericks']}
+      host = basic_hosts.first
+      host['platform'] = platform
+      opts = { :version => '0.1.0' }
+
+
+      expect(subject).to receive(:link_exists?).with(/#{Regexp.escape('puppet-agent/0.1.0/repos/apple/10.9/PC1/x86_64')}/).and_return(true).twice
+      expect(subject).to receive(:fetch_http_file).once.with(/#{Regexp.escape('apple/10.9/PC1/x86_64')}$/, 'puppet-agent-0.1.0-1.osx10.9.dmg', /\/osx$/)
+      expect(subject).to receive(:scp_to).once.with(host, /\/puppet-agent-0.1.0-1.osx10.9.dmg$/, /var\/root/)
+      expect(host).to receive( :install_package ).with(/puppet-agent-0.1.0\*/)
+
+      subject.install_puppet_agent_dev_repo_on( host, opts )
+    end
+
     it 'runs the correct install for osx platforms (new link format)' do
       platform = Object.new()
       allow(platform).to receive(:to_array) { ['osx', '10.9', 'x86_64', 'mavericks']}
       host = basic_hosts.first
       host['platform'] = platform
       opts = { :version => '0.1.0' }
-      allow( subject ).to receive( :options ).and_return( {} )
-      copied_path = "#{win_temp}\\puppet-agent-x64.msi"
-      mock_echo = Object.new()
-      allow( mock_echo ).to receive( :raw_output ).and_return( copied_path )
 
-      expect(subject).to receive(:link_exists?).with(/\/puppet-agent\/0.1.0\/repos\/apple\/10.9\/PC1\/x86_64\//).and_return(true)
-      expect(subject).to receive(:fetch_http_file).once.with(/\/apple\/10.9\/PC1\/x86_64$/, 'puppet-agent-0.1.0-1.mavericks.dmg', /\/osx$/)
+      expect(subject).to receive(:link_exists?).with(/#{Regexp.escape('puppet-agent/0.1.0/repos/apple/10.9/PC1/x86_64/')}/).and_return(false, true)
+      expect(subject).to receive(:fetch_http_file).once.with(/#{Regexp.escape('/apple/10.9/PC1/x86_64')}$/, 'puppet-agent-0.1.0-1.mavericks.dmg', /\/osx$/)
       expect(subject).to receive(:scp_to).once.with(host, /\/puppet-agent-0.1.0-1.mavericks.dmg$/, /var\/root/)
       expect(host).to receive( :install_package ).with(/puppet-agent-0.1.0\*/)
 
       subject.install_puppet_agent_dev_repo_on( host, opts )
-
     end
 
     it 'runs the correct install for osx platforms (old link format)' do
@@ -903,19 +914,13 @@ describe ClassMixedWithDSLInstallUtils do
       host = basic_hosts.first
       host['platform'] = platform
       opts = { :version => '0.1.0' }
-      allow( subject ).to receive( :options ).and_return( {} )
-      copied_path = "#{win_temp}\\puppet-agent-x64.msi"
-      mock_echo = Object.new()
-      allow( mock_echo ).to receive( :raw_output ).and_return( copied_path )
 
-      expect(subject).to receive(:link_exists?).with(/\/puppet-agent\/0.1.0\/repos\/apple\/10.9\/PC1\/x86_64\//).and_return(false)
-      expect(subject).to receive(:fetch_http_file).once.with(/\/puppet-agent\/0.1.0\/repos\/apple\/PC1$/, 'puppet-agent-0.1.0-osx-10.9-x86_64.dmg', /\/osx$/)
+      expect(subject).to receive(:link_exists?).with(/#{Regexp.escape('/puppet-agent/0.1.0/repos/apple/10.9/PC1/x86_64/')}/).and_return(false, false)
+      expect(subject).to receive(:fetch_http_file).once.with(/#{Regexp.escape('/puppet-agent/0.1.0/repos/apple/PC1')}$/, 'puppet-agent-0.1.0-osx-10.9-x86_64.dmg', /\/osx$/)
       expect(subject).to receive(:scp_to).once.with(host, /\/puppet-agent-0.1.0-osx-10.9-x86_64.dmg$/, /var\/root/)
       expect(host).to receive( :install_package ).with(/puppet-agent-0.1.0\*/)
 
       subject.install_puppet_agent_dev_repo_on( host, opts )
-
-
     end
 
     it 'allows you to override the local copy directory' do

data/spec/beaker/host_spec.rb

@@ -297,6 +297,18 @@ module Beaker
           :acceptable_exit_codes  => [0, 1],
           :accept_all_exit_codes  => true
         }
+        allow( host.logger ).to receive( :warn )
+
+        expect { host.exec(command, opts) }.to_not raise_error
+      end
+
+      it 'sends a warning when both :acceptable_exit_codes & :accept_all_exit_codes are set' do
+        result.exit_code = 7
+        opts = {
+          :acceptable_exit_codes  => [0, 1],
+          :accept_all_exit_codes  => true
+        }
+        expect( host.logger ).to receive( :warn ).with( /overrides/ )
 
         expect { host.exec(command, opts) }.to_not raise_error
       end

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -5,7 +5,13 @@ module Beaker
     let( :options ) { make_opts.merge({ 'logger' => double().as_null_object }) }
     let(:aws) {
       # Mock out the call to load_fog_credentials
-      allow_any_instance_of( Beaker::AwsSdk ).to receive(:load_fog_credentials).and_return(fog_file_contents)
+      allow_any_instance_of( Beaker::AwsSdk ).
+        to receive(:load_fog_credentials).
+        and_return({
+          :access_key => fog_file_contents[:default][:aws_access_key_id],
+          :secret_key => fog_file_contents[:default][:aws_secret_access_key],
+        })
+
 
       # This is needed because the EC2 api looks up a local endpoints.json file
       FakeFS.deactivate!
@@ -42,6 +48,28 @@ module Beaker
       @hosts[3][:user] = "ubuntu"
       @hosts[4][:platform] = 'f5-host'
       @hosts[4][:user] = 'notroot'
+
+      ENV['AWS_ACCESS_KEY'] = nil
+      ENV['AWS_SECRET_ACCESS_KEY'] = nil
+    end
+
+    context 'loading credentials' do
+
+      it 'from .fog file' do
+        creds = aws.load_fog_credentials
+        expect( creds[:access_key] ).to eq("IMANACCESSKEY")
+        expect( creds[:secret_key] ).to eq("supersekritkey")
+      end
+
+
+      it 'from environment variables' do
+        ENV['AWS_ACCESS_KEY_ID'] = "IMANACCESSKEY"
+        ENV['AWS_SECRET_ACCESS_KEY'] = "supersekritkey"
+
+        creds = aws.load_env_credentials
+        expect( creds[:access_key] ).to eq("IMANACCESSKEY")
+        expect( creds[:secret_key] ).to eq("supersekritkey")
+      end
     end
 
     describe '#provision' do
@@ -76,12 +104,12 @@ module Beaker
         instance_set = [ec2_instance, vpc_instance, nil_instance, unreal_instance]
         expect(aws.kill_instances(instance_set)).to be_nil
       end
-  
+
       it 'cleanly handles an empty instance list' do
         instance_set = []
         expect(aws.kill_instances(instance_set)).to be_nil
       end
-  
+
       context 'in general use' do
         let( :instance_set ) { [ec2_instance, vpc_instance] }
 
@@ -91,7 +119,7 @@ module Beaker
           end
           expect(kill_instances).to be_nil
         end
-  
+
         it 'verifies instances are not nil' do
           instance_set.each do |instance|
             expect(instance).to receive(:nil?)
@@ -99,7 +127,7 @@ module Beaker
           end
           expect(kill_instances).to be_nil
         end
-  
+
         it 'verifies instances exist in AWS' do
           instance_set.each do |instance|
             expect(instance).to receive(:exists?)
@@ -118,7 +146,7 @@ module Beaker
           end
           expect(kill_instances).to be_nil
         end
-  
+
         it 'verifies instance is not nil' do
           instance_set.each do |instance|
             expect(instance).to receive(:nil?)
@@ -126,7 +154,7 @@ module Beaker
           end
           expect(kill_instances).to be_nil
         end
-  
+
         it 'verifies instance exists in AWS' do
           instance_set.each do |instance|
             expect(instance).to receive(:exists?)
@@ -541,7 +569,7 @@ module Beaker
           @hosts.each {|host| expect(host).to receive(:exec).once}
           expect(set_hostnames).to eq(@hosts)
         end
-  
+
         it 'passes a Command instance to exec' do
           @hosts.each do |host|
             expect(host).to receive(:exec).with( instance_of(Beaker::Command) ).once
@@ -759,7 +787,7 @@ module Beaker
       subject(:load_fog_credentials) { aws.load_fog_credentials(dot_fog) }
 
       it 'returns loaded fog credentials' do
-        fog_hash = {:default => {:aws_access_key_id => 'awskey', :aws_secret_access_key => 'awspass'}} 
+        fog_hash = {:default => {:aws_access_key_id => 'awskey', :aws_secret_access_key => 'awspass'}}
         expect(aws).to receive(:load_fog_credentials).and_call_original
         expect(YAML).to receive(:load_file).and_return(fog_hash)
         expect(load_fog_credentials).to eq(creds)
@@ -767,16 +795,16 @@ module Beaker
 
       context 'raises errors' do
         it 'if missing access_key credential' do
-          fog_hash = {:default => {:aws_secret_access_key => 'awspass'}} 
+          fog_hash = {:default => {:aws_secret_access_key => 'awspass'}}
           err_text = "You must specify an aws_access_key_id in your .fog file (#{dot_fog}) for ec2 instances!"
           expect(aws).to receive(:load_fog_credentials).and_call_original
           expect(YAML).to receive(:load_file).and_return(fog_hash)
           expect { load_fog_credentials }.to raise_error(err_text)
         end
-  
+
         it 'if missing secret_key credential' do
           dot_fog = '.fog'
-          fog_hash = {:default => {:aws_access_key_id => 'awskey'}} 
+          fog_hash = {:default => {:aws_access_key_id => 'awskey'}}
           err_text = "You must specify an aws_secret_access_key in your .fog file (#{dot_fog}) for ec2 instances!"
           expect(aws).to receive(:load_fog_credentials).and_call_original
           expect(YAML).to receive(:load_file).and_return(fog_hash)

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -96,11 +96,13 @@ module Beaker
           options[:root_keys]         = true
           options[:add_el_extras]     = true
           options[:disable_iptables]  = true
+          options[:host_name_prefix]  = "test-"
           expect( hypervisor ).to_not receive( :timesync )
           expect( hypervisor ).to_not receive( :sync_root_keys )
           expect( hypervisor ).to_not receive( :add_el_extras )
           expect( hypervisor ).to_not receive( :disable_iptables )
           expect( hypervisor ).to_not receive( :set_env )
+          expect( hypervisor ).to_not receive( :host_name_prefix )
           hypervisor.configure
         end
       end
@@ -113,6 +115,15 @@ module Beaker
         end
       end
 
+      context 'if :host_name_prefix is set' do
+        it "generates hostname with prefix" do
+          prefix = "testing-prefix-to-test-"
+          options[:host_name_prefix] = prefix
+	  expect( hypervisor.generate_host_name().start_with?(prefix) ).to be true
+	  expect( hypervisor.generate_host_name().length - prefix.length >= 15 ).to be true
+        end
+      end
+
     end
 
   end

data/spec/helpers.rb

@@ -7,8 +7,8 @@ module TestFileHelpers
   end
 
   def fog_file_contents
-    { :default => { :access_key => "IMANACCESSKEY",
-                    :secret_access => "supersekritkey",
+    { :default => { :aws_access_key_id => "IMANACCESSKEY",
+                    :aws_secret_access_key => "supersekritkey",
                     :aix_hypervisor_server => "aix_hypervisor.labs.net",
                     :aix_hypervisor_username => "aixer",
                     :aix_hypervisor_keyfile => "/Users/user/.ssh/id_rsa-acceptance",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.24.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -441,6 +441,7 @@ files:
 - acceptance/pre_suite/puppet_git/install.rb
 - acceptance/pre_suite/puppet_pkg/install.rb
 - acceptance/tests/base/README.md
+- acceptance/tests/base/dsl/structure_test.rb
 - acceptance/tests/base/host.rb
 - acceptance/tests/base/packages.rb
 - acceptance/tests/base/packages_unix.rb