beaker 3.4.0 → 3.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjUxN2I4ODkyOTg4MjI0YzI0MGVkNjEwNWU5NzFiNjZkMzc0MzgzYw==
+    ZjA4NTNhN2IzZmUxODliZjcwOGEwNzQ1ZTZiZDBmMDg0ZTY3ZTMxMg==
   data.tar.gz: !binary |-
-    YjdmY2JmOTI1YTMyYjQxMzM3MDBhZjMzYTIwOWUwMjg3MWViYmE2Ng==
+    NjUyZWJiNmU3MDkyYjNmMjIyMjg4MWU3MjE5ZmQxZDZlMTM0MmYxOA==
 SHA512:
   metadata.gz: !binary |-
-    MWU2MTdkYWRlYmNjM2I1NmQ2MjM5MzJlNWNiYTc5MGFhYjc2MDg0ZjZmMTg2
-    MGRlNzU0Y2YyNDFiMDI5NWIyNzQ4MmRhZmEyYTMxYjYzODNjYmEyZDRhMTM1
-    MWY3ZTFjZDE5NWY2MDQ0ZjJiZDlhYmE5OTFkZWI0NDExY2E1YzE=
+    YzEzYTAxMDk1NjcyM2FlMDY0MWVlYTQ2ZjY4Njk0YTU2NWU1NDBlZGE0YmQ2
+    M2RkNjkxMDlhMDI2YjJmNzdhM2Y1MjhmNTlmZjczYjUzOGFkY2E2OGI0N2U1
+    ZmNkNDU5N2MzOTE5NWNiZTU0N2QyZDc3ZGFmZTYyODJkMjA0MmQ=
   data.tar.gz: !binary |-
-    MWY5M2I4ZjIxMDA0NzUwNGM2MTU0MDcwMmNmMzcyYjI3NDY3YWNiY2VjMjdh
-    NDBiNTRhNmRjZGYzNzQ2YjQ0MTc3NTNkZjU1MWNlYTg4MmU1M2YwYTY1NmUz
-    MzY2ZGMzM2ZjZjI4Nzk4YWU5Y2E1YzhkOTNlMGVjYzAxMWJhYmY=
+    ZWVjZGY0YjBiYmQ3Y2RlMTljOGVlNjM3NGFkZTBmOGZiNGE4ZWFhMmVhZmFi
+    MTI2ZTUxNzUwNGQ2ODNhNWU2NGEyZGYzNTc1MjdjNWExZTBmNjE4YmRjMzIy
+    NTA1Nzc4MGY5NjIzZDQ5YWRmZThlYzBiODIxOWVlMTZjYTI2YzU=

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

@@ -314,7 +314,7 @@ module Beaker
         #
         # @param [Host] host Host the service runs on
         # @param [String] service Name of the service to restart
-        # @param [Fixnum] curl_retries Number of times to retry the restart command
+        # @param [Fixnum] curl_retries Number of seconds to wait for the restart to complete before failing
         # @param [Fixnum] port Port to check status at
         #
         # @return [Result] Result of last status check
@@ -327,8 +327,14 @@ module Beaker
             apachectl_path = host.is_pe? ? "#{host['puppetsbindir']}/#{service}" : service
             host.exec(Command.new("#{apachectl_path} graceful"))
           else
-            host.exec puppet_resource('service', service, 'ensure=stopped')
-            host.exec puppet_resource('service', service, 'ensure=running')
+            result = host.exec(Command.new("service #{service} reload"),
+                               :acceptable_exit_codes => [0,1,3])
+            if result.exit_code == 0
+              return result
+            else
+              host.exec puppet_resource('service', service, 'ensure=stopped')
+              host.exec puppet_resource('service', service, 'ensure=running')
+            end
           end
           curl_with_retries(" #{service} ", host, "https://localhost:#{port}", [35, 60], curl_retries)
         end

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

@@ -1031,7 +1031,11 @@ module Beaker
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @param [Hash{Symbol=>String}] opts An options hash
-        # @option opts [String] :puppet_agent_version The version of puppet-agent to install
+        # @option opts [String] :puppet_agent_version The version of puppet-agent to install. This
+        #                       parameter is used by puppet with the +SUITE_VERSION+ environment
+        #                       variable to provide a `git describe` value to beaker to create a
+        #                       build server URL. Note that +puppet_agent_sha+ will still be used
+        #                       instead of this if a value is provided for that option
         # @option opts [String] :puppet_agent_sha The sha of puppet-agent to install, defaults to provided
         #                       puppet_agent_version
         # @option opts [String] :copy_base_local Directory where puppet-agent artifact
@@ -1062,15 +1066,19 @@ module Beaker
           if not opts[:puppet_agent_version]
             raise "must provide :puppet_agent_version (puppet-agent version) for install_puppet_agent_dev_repo_on"
           end
+          # TODO consolidate these values as they serve no purpose from beaker's side
+          # you could provide any values you could to one to the other
+          puppet_agent_version = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
+
+          opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
+          opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{ puppet_agent_version }/repos/"
+          opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
+          opts[:puppet_collection]  ||= 'PC1'
+          release_path = opts[:download_url]
 
           block_on hosts do |host|
             variant, version, arch, codename = host['platform'].to_array
-            opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
-            opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{ opts[:puppet_agent_sha] || opts[:puppet_agent_version] }/repos/"
-            opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
-            opts[:puppet_collection] ||= 'PC1'
             add_role(host, 'aio') #we are installing agent, so we want aio role
-            release_path = opts[:download_url]
             copy_dir_local = File.join(opts[:copy_base_local], variant)
             onhost_copy_base = opts[:copy_dir_external] || host.external_copy_base
 
@@ -1079,9 +1087,8 @@ module Beaker
               if arch == 's390x'
                 logger.trace("#install_puppet_agent_dev_repo_on: s390x arch detected for host #{host}. using dev package")
               else
-                sha = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
                 opts[:dev_builds_repos] ||= [ opts[:puppet_collection] ]
-                install_puppetlabs_dev_repo( host, 'puppet-agent', sha, nil, opts )
+                install_puppetlabs_dev_repo( host, 'puppet-agent', puppet_agent_version, nil, opts )
                 host.install_package('puppet-agent')
                 logger.trace("#install_puppet_agent_dev_repo_on: install_puppetlabs_dev_repo finished")
                 next

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

@@ -65,8 +65,8 @@ module Mac::Pkg
   # @param [String] puppet_agent_version Version of puppet agent to get
   # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
   #
-  # @note OSX doesn't use any additional options at this time, but does require
-  #   both puppet_collection & puppet_agent_version, & will fail without them
+  # @note OSX does require :download_url to be set on the opts argument
+  #   in order to check for builds on the builds server
   #
   # @raise [ArgumentError] If one of the two required parameters (puppet_collection,
   #   puppet_agent_version) is either not passed or set to nil
@@ -76,6 +76,7 @@ module Mac::Pkg
     error_message = "Must provide %s argument to get puppet agent dev package information"
     raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
     raise ArgumentError, error_message % "puppet_agent_version" unless puppet_agent_version
+    raise ArgumentError, error_message % "opts[:download_url]" unless opts[:download_url]
 
     variant, version, arch, codename = self['platform'].to_array
 

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

@@ -376,8 +376,9 @@ module Unix::Pkg
   # @param [String] puppet_agent_version Version of puppet agent to get
   # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
   #
-  # @note Solaris does require some options to be set. See
-  #   {#solaris_puppet_agent_dev_package_info} for more details
+  # @note Solaris & OSX do require some options to be set. See
+  #   {#solaris_puppet_agent_dev_package_info} &
+  #   {Mac::Pkg#puppet_agent_dev_package_info} for more details
   #
   # @raise [ArgumentError] If one of the two required parameters (puppet_collection,
   #   puppet_agent_version) is either not passed or set to nil

data/lib/beaker/hypervisor/openstack.rb

@@ -171,21 +171,17 @@ module Beaker
       end
     end
 
-    # Get a floating IP address to associate with the instance, and
-    # allocate a new one if none are available
+    # Get a floating IP address to associate with the instance, try
+    # to allocate a new one from the specified pool if none are available
     def get_ip
-      @logger.debug "Finding IP"
-      ip = @compute_client.addresses.find { |ip| ip.instance_id.nil? }
-      if ip.nil?
-        begin
-          @logger.debug "Creating IP"
-          ip = @compute_client.addresses.create
-        rescue Fog::Compute::OpenStack::NotFound
-          # If there are no more floating IP addresses, allocate a
-          # new one and try again. 
-          @compute_client.allocate_address(@options[:floating_ip_pool])
-          ip = @compute_client.addresses.find { |ip| ip.instance_id.nil? }
-        end
+      begin
+        @logger.debug "Creating IP"
+        ip = @compute_client.addresses.create
+      rescue Fog::Compute::OpenStack::NotFound
+        # If there are no more floating IP addresses, allocate a
+        # new one and try again. 
+        @compute_client.allocate_address(@options[:floating_ip_pool])
+        ip = @compute_client.addresses.find { |ip| ip.instance_id.nil? }
       end
       raise 'Could not find or allocate an address' if not ip
       ip

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.4.0'
+    STRING = '3.5.0'
   end
 end

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -1045,13 +1045,37 @@ describe ClassMixedWithDSLHelpers do
 
   describe '#bounce_service' do
     let( :options ) { Beaker::Options::Presets.new.presets }
+    let( :result ) { double.as_null_object }
     before :each do
       allow( subject ).to receive( :options ) { options }
     end
 
+    it 'requests a reload but not a restart if the reload is successful' do
+      host = FakeHost.create
+      allow( result ).to receive( :exit_code ).and_return( 0 )
+      allow( host ).to receive( :any_exec_result ).and_return( result )
+      subject.bounce_service( host, 'not_real_service')
+      expect( host ).to execute_commands_matching(/service not_real_service reload/).exactly( 1 ).times
+      expect( host ).to execute_commands_matching(/puppet resource service not_real_service ensure=stopped/).exactly( 0 ).times
+      expect( host ).to execute_commands_matching(/puppet resource service not_real_service ensure=started/).exactly( 0 ).times
+    end
+
+    it 'requests a restart if the reload fails' do
+      host = FakeHost.create
+      allow( result ).to receive( :exit_code ).and_return( 1 )
+      allow( host ).to receive( :any_exec_result ).and_return( result )
+      expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8140/, anything(), anything() )
+      subject.bounce_service( host, 'not_real_service')
+      expect( host ).to execute_commands_matching(/service not_real_service reload/).exactly( 1 ).times
+      expect( host ).to execute_commands_matching(/puppet resource service not_real_service ensure=stopped/).exactly( 1 ).times
+      expect( host ).to execute_commands_matching(/puppet resource service not_real_service ensure=running/).exactly( 1 ).times
+    end
+
     it 'uses the default port argument if none given' do
       host = hosts[0]
       expect( host ).to receive( :graceful_restarts? ).and_return( false )
+      allow( result ).to receive( :exit_code ).and_return( 1 )
+      expect( host ).to receive( :exec ).and_return( result )
       expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8140/, anything(), anything() )
       subject.bounce_service( host, 'not_real_service')
     end
@@ -1059,6 +1083,8 @@ describe ClassMixedWithDSLHelpers do
     it 'takes the port argument' do
       host = hosts[0]
       expect( host ).to receive( :graceful_restarts? ).and_return( false )
+      allow( result ).to receive( :exit_code ).and_return( 1 )
+      expect( host ).to receive( :exec ).and_return( result )
       expect( subject ).to receive( :curl_with_retries ).with( anything(), anything(), /8000/, anything(), anything() )
       subject.bounce_service( host, 'not_real_service', nil, 8000)
     end

data/spec/beaker/host/mac_spec.rb

@@ -14,30 +14,34 @@ module Mac
 
     describe '#puppet_agent_dev_package_info' do
       it 'raises an error if puppet_collection isn\'t passed' do
-        expect { host.puppet_agent_dev_package_info(nil, 'maybe') }.to raise_error(ArgumentError)
+        expect { host.puppet_agent_dev_package_info(nil, 'maybe', :download_url => '') }.to raise_error(ArgumentError)
       end
 
-      it 'raises as error if puppet_agent_version isn\'t passed' do
-        expect { host.puppet_agent_dev_package_info('maybe', nil) }.to raise_error(ArgumentError)
+      it 'raises an error if puppet_agent_version isn\'t passed' do
+        expect { host.puppet_agent_dev_package_info('maybe', nil, :download_url => '') }.to raise_error(ArgumentError)
+      end
+
+      it 'raises an error if opts[:download_url] isn\'t passed' do
+        expect { host.puppet_agent_dev_package_info('', '') }.to raise_error(ArgumentError)
       end
 
       it 'returns two strings that include the passed parameters' do
         allow( host ).to receive( :link_exists? ) { true }
-        return1, return2 = host.puppet_agent_dev_package_info( 'pc1', 'pav1' )
+        return1, return2 = host.puppet_agent_dev_package_info( 'pc1', 'pav1', :download_url => '' )
         expect( return1 ).to match( /pc1/ )
         expect( return2 ).to match( /pav1/ )
       end
 
       it 'gets the correct file type' do
         allow( host ).to receive( :link_exists? ) { true }
-        _, return2 = host.puppet_agent_dev_package_info( 'pc1', 'pav1' )
+        _, return2 = host.puppet_agent_dev_package_info( 'pc2', 'pav2', :download_url => '' )
         expect( return2 ).to match( /\.dmg$/ )
       end
 
       it 'adds the version dot correctly if not supplied' do
         @platform = 'osx-109-x86_64'
         allow( host ).to receive( :link_exists? ) { true }
-        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC3', 'pav3' )
+        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC3', 'pav3', :download_url => '' )
         expect( release_path_end ).to match( /10\.9/ )
         expect( release_file ).to match( /10\.9/ )
       end
@@ -45,7 +49,7 @@ module Mac
       it 'runs the correct install for osx platforms (newest link format)' do
         allow( host ).to receive( :link_exists? ) { true }
 
-        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC4', 'pav4' )
+        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC4', 'pav4', :download_url => '' )
         # verify the mac package name starts the name correctly
         expect( release_file ).to match( /^puppet-agent-pav4-/ )
         # verify the "newest hotness" is set correctly for the end of the mac package name
@@ -57,7 +61,7 @@ module Mac
       it 'runs the correct install for osx platforms (new link format)' do
         allow( host ).to receive( :link_exists? ).and_return( false, true )
 
-        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC7', 'pav7' )
+        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC7', 'pav7', :download_url => '' )
         # verify the mac package name starts the name correctly
         expect( release_file ).to match( /^puppet-agent-pav7-/ )
         # verify the "new hotness" is set correctly for the end of the mac package name
@@ -69,7 +73,7 @@ module Mac
       it 'runs the correct install for osx platforms (old link format)' do
         allow( host ).to receive( :link_exists? ) { false }
 
-        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC8', 'pav8' )
+        release_path_end, release_file = host.puppet_agent_dev_package_info( 'PC8', 'pav8', :download_url => '' )
         # verify the mac package name starts the name correctly
         expect( release_file ).to match( /^puppet-agent-pav8-/ )
         # verify the old way is set correctly for the end of the mac package name

data/spec/beaker/hypervisor/openstack_spec.rb

@@ -88,5 +88,21 @@ module Beaker
       end
     end
 
+    it 'get_ip always allocates a new floatingip' do
+      # Assume beaker is being executed in parallel N times by travis (or similar).
+      # IPs are allocated (but not associated) before an instance is created; it is
+      # hightly possible the first instance will allocate a new IP and create an ssh
+      # key.  While the instance is being created the other N-1 instances come along,
+      # find the unused IP and try to use it as well which causes keyname clashes
+      # and other IP related shenannigans.  Ensure we allocate a new IP each and every
+      # time
+      mock_addresses = double().as_null_object
+      mock_ip = double().as_null_object
+      allow(@compute_client).to receive(:addresses).and_return(mock_addresses)
+      allow(mock_addresses).to receive(:create).and_return(mock_ip)
+      expect(mock_addresses).to receive(:create).exactly(3).times
+      (1..3).each { openstack.get_ip }
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec