beaker 1.11.1 → 1.11.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGQ0YzFjMDg1ZWEzZmIxNTgzOWQ0NmM4MmIyODM1NmNiZjA2YzBjZg==
+    YzdiZWJkMDg4NTUxZmY5NGYyYTczYjU3MGE2MThlZjU5ZmFiN2JmZQ==
   data.tar.gz: !binary |-
-    NzMxOTllOGEwMWRjZDQ0MzMxY2VkMDI4ZDBmZWExZGE4NGVhZTgwNw==
+    MTgzYTI4YzdmOTFjNmVjMDIzYWJmODkxOWUxMTVhYjczNjY5MzU3Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZmFiYjE3ODI1NWRiZDc0ZDg0ODJmYjdmOTU0ZjczYmE3YTc2OTdkNDY2ZTQx
-    MjJkYTRjYjM5MzQwZDIxNWYyMTAwYTllNzRkNGZjZWFmZDNhNDhmMmRlZjQ0
-    OTc3YTBhYTgwYTg5Nzc2ZWI0ZWVhODA3YjI5NTlmNDc4NmVhYmQ=
+    ZTJjZTg2NmU3OTY3MTVlNzIzNGE4NTA2YjU3ZmY2OTlhYTg5Yjk2NDkyMTc1
+    YzNlMDE3ZmNlNGUyZTNlYWJjOGQ5YTg5YTJiMzNmYzBiOTBiYjA4OTYxNzJl
+    YWFmNGM0OWNjNTI1YzJhZDA1MWMwNjYwN2Y1NGE2ZjBkZDdiNTA=
   data.tar.gz: !binary |-
-    Zjk0OGFhOWE5MGY2NDk4MzY3MjNiNGMyZWRmNjhlNjM4NWUzNTRiZTJmODE0
-    OTE4ZWIwNzkxZTJiMjY3N2ZmMjY1OTE2YzQ5NDdiYjIxMDEzOTdiN2JkNWJj
-    OGJjZjFlOTg3NzA4NWJkODk3YTRiNWRjM2FhYzM4ZDI1ZjJlNTA=
+    ZjBlMjU0M2FjZDRmMmIxN2U5ZDYxNmVkZWU3MzA1Njk2ZDBkYjFhOGRhNWM4
+    YWY3Njg3ZjEwNTAzMGViNzFjYzY4ZTlkNDYxYjVmYzg5MzkxNDhkYWIwNjlj
+    YTNlZWJlNGYwNWUxYmM3ODA4ZWFiYWMzYWI3ZGVkMTJkZDU5MTU=

data/lib/beaker/dsl/helpers.rb

@@ -921,20 +921,12 @@ module Beaker
           sleep 2 unless agent_running
         end
 
-        if agent['platform'].include?('solaris')
-          on(agent, '/usr/sbin/svcadm disable -s svc:/network/pe-puppet:default')
-        elsif agent['platform'].include?('aix')
-          on(agent, '/usr/bin/stopsrc -s pe-puppet')
-        elsif agent['platform'].include?('windows')
-          on(agent, 'net stop pe-puppet', :acceptable_exit_codes => [0,2])
-        else
-          # For the sake of not passing the PE version into this method,
-          # we just query the system to find out which service we want to
-          # stop
-          result = on agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1]
-          service = (result.exit_code == 0) ? 'pe-puppet-agent' : 'pe-puppet'
-          on(agent, "/etc/init.d/#{service} stop")
-        end
+        # The agent service is `pe-puppet` everywhere EXCEPT certain linux distros on PE 2.8
+        # In all the case that it is different, this init script will exist. So we can assume
+        # that if the script doesn't exist, we should just use `pe-puppet`
+        result = on agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1]
+        agent_service = (result.exit_code == 0) ? 'pe-puppet-agent' : 'pe-puppet'
+        on agent, puppet_resource('service', agent_service, 'ensure=stopped')
       end
 
       #stops the puppet agent running on the default host

data/lib/beaker/dsl/install_utils.rb

@@ -191,9 +191,9 @@ module Beaker
       #                  (Otherwise uses individual Windows hosts pe_ver)
       # @api private
       def fetch_puppet_on_windows(host, opts)
-        path = opts[:pe_dir] || host['pe_dir']
+        path = host['pe_dir'] || opts[:pe_dir]
         local = File.directory?(path)
-        version = opts[:pe_ver_win] || host['pe_ver']
+        version = host['pe_ver'] || opts[:pe_ver_win]
         filename = "puppet-enterprise-#{version}"
         extension = ".msi"
         if local
@@ -219,7 +219,7 @@ module Beaker
       #                  (Otherwise uses individual hosts pe_ver)
       # @api private
       def fetch_puppet_on_unix(host, opts)
-        path = opts[:pe_dir] || host['pe_dir']
+        path = host['pe_dir'] || opts[:pe_dir]
         local = File.directory?(path)
         filename = "#{host['dist']}"
         if local

data/lib/beaker/dsl/wrappers.rb

@@ -32,6 +32,18 @@ module Beaker
         Command.new('hiera', args, options )
       end
 
+      # This is hairy and because of legacy code it will take a bit more
+      # work to disentangle all of the things that are being passed into
+      # this catchall param.
+      #
+      # @api dsl
+      def razor(*args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        options['ENV'] ||= {}
+        options['ENV'] = options['ENV'].merge( Command::DEFAULT_GIT_ENV )
+        Command.new('razor', args, options )
+      end
+
       # @param [String] command_string A string of to be interpolated
       #                                within the context of a host in
       #                                question

data/lib/beaker/host_prebuilt_steps.rb

@@ -17,8 +17,8 @@ module Beaker
     SLES_PACKAGES = ['ntp']
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
-    ROOT_KEYS_SCRIPT = "https://raw.github.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
-    ROOT_KEYS_SYNC_CMD = "curl -k -o - #{ROOT_KEYS_SCRIPT} | %s"
+    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"
     APT_CFG = %q{ Acquire::http::Proxy "http://proxy.puppetlabs.net:3128/"; }
     IPS_PKG_REPO="http://solaris-11-internal-repo.delivery.puppetlabs.net"
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.11.1'
+    STRING = '1.11.2'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -551,50 +551,15 @@ describe ClassMixedWithDSLHelpers do
       result_pass.exit_code = 0
     end
 
-    it 'runs the correct command on solaris' do
-      vardir = '/var'
-      solaris_agent = make_host( 'solaris', :platform => 'solaris' )
-      solaris_agent.stub( :puppet ).and_return( { 'vardir' => vardir } )
-
-      subject.should_receive( :on ).with( solaris_agent, "[ -e '#{vardir}/state/agent_catalog_run.lock' ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
-      subject.should_receive( :on ).with( solaris_agent, '/usr/sbin/svcadm disable -s svc:/network/pe-puppet:default' ).once
-
-      subject.stop_agent_on( solaris_agent )
-
-    end
-
-    it 'runs the correct command on aix' do
-      vardir = '/var'
-      aix_agent = make_host( 'aix', :platform => 'aix' )
-      aix_agent.stub( :puppet ).and_return( { 'vardir' => vardir } )
-
-      subject.should_receive( :on ).with( aix_agent, "[ -e '#{vardir}/state/agent_catalog_run.lock' ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
-      subject.should_receive( :on ).with( aix_agent, '/usr/bin/stopsrc -s pe-puppet' ).once
-
-      subject.stop_agent_on( aix_agent )
-
-    end
-
-    it 'runs the correct command on windows' do
-      vardir = '/var'
-      win_agent = make_host( 'win', :platform => 'windows' )
-      win_agent.stub( :puppet ).and_return( { 'vardir' => vardir } )
-
-      subject.should_receive( :on ).with( win_agent, "[ -e '#{vardir}/state/agent_catalog_run.lock' ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
-      subject.should_receive( :on ).with( win_agent, 'net stop pe-puppet', :acceptable_exit_codes => [0,2] ).once
-
-      subject.stop_agent_on( win_agent )
-
-    end
-
-    it 'runs the pe-puppet on a unix system without pe-puppet-agent' do
+    it 'runs the pe-puppet on a system without pe-puppet-agent' do
       vardir = '/var'
       deb_agent = make_host( 'deb', :platform => 'debian-7-amd64' )
       deb_agent.stub( :puppet ).and_return( { 'vardir' => vardir } )
 
       subject.should_receive( :on ).with( deb_agent, "[ -e '#{vardir}/state/agent_catalog_run.lock' ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
       subject.should_receive( :on ).with( deb_agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
-      subject.should_receive( :on ).with( deb_agent, "/etc/init.d/pe-puppet stop" ).once
+      subject.should_receive( :puppet_resource ).with( "service", "pe-puppet", "ensure=stopped").once
+      subject.should_receive( :on ).once
 
       subject.stop_agent_on( deb_agent )
 
@@ -607,7 +572,8 @@ describe ClassMixedWithDSLHelpers do
 
       subject.should_receive( :on ).with( el_agent, "[ -e '#{vardir}/state/agent_catalog_run.lock' ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_fail )
       subject.should_receive( :on ).with( el_agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1] ).once.and_return( result_pass )
-      subject.should_receive( :on ).with( el_agent, "/etc/init.d/pe-puppet-agent stop" ).once
+      subject.should_receive( :puppet_resource ).with("service", "pe-puppet-agent", "ensure=stopped").once
+      subject.should_receive( :on ).once
 
       subject.stop_agent_on( el_agent )
     end

data/spec/beaker/dsl/wrappers_spec.rb

@@ -23,6 +23,14 @@ describe ClassMixedWithDSLWrappers do
     end
   end
 
+  describe '#razor' do
+    it 'should split out the options and pass "razor" as first arg to Command' do
+      Beaker::Command.should_receive( :new ).
+        with('razor', [ '-p' ], opts)
+      subject.razor( '-p' )
+    end
+  end
+
   describe '#puppet' do
     it 'should split out the options and pass "puppet <blank>" to Command' do
       merged_opts = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest