beaker 1.11.2 → 1.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdiZWJkMDg4NTUxZmY5NGYyYTczYjU3MGE2MThlZjU5ZmFiN2JmZQ==
+    NWYzNDNkZGNiOTY2ZTlkYTFmNWMwM2ZmYTU2ZTVkYTc4Nzg2MmM0ZA==
   data.tar.gz: !binary |-
-    MTgzYTI4YzdmOTFjNmVjMDIzYWJmODkxOWUxMTVhYjczNjY5MzU3Mg==
+    NTg2ODk5ZjczMzM0ZWQzZTk4YzM2ZGZmODYyOGJmOTE4YmRiNmEzZg==
 SHA512:
   metadata.gz: !binary |-
-    ZTJjZTg2NmU3OTY3MTVlNzIzNGE4NTA2YjU3ZmY2OTlhYTg5Yjk2NDkyMTc1
-    YzNlMDE3ZmNlNGUyZTNlYWJjOGQ5YTg5YTJiMzNmYzBiOTBiYjA4OTYxNzJl
-    YWFmNGM0OWNjNTI1YzJhZDA1MWMwNjYwN2Y1NGE2ZjBkZDdiNTA=
+    ZDU3MDhmZTdjZDYxMGQ5MmIyZDdmMWQ5ZDc2MWE5OGJlNmNkODEwM2NkM2Q1
+    NWJlNjg4NDM3MzMwZGI4OTQ4MmZlZjBlM2M1MjE3NjAyMjA4ZDM0OTM5MTMy
+    ZTQ5OGZjNmU2YTdiMzI2OTlmMmNiMGY4NWI4YmM2NGQ2ZWQ2YWU=
   data.tar.gz: !binary |-
-    ZjBlMjU0M2FjZDRmMmIxN2U5ZDYxNmVkZWU3MzA1Njk2ZDBkYjFhOGRhNWM4
-    YWY3Njg3ZjEwNTAzMGViNzFjYzY4ZTlkNDYxYjVmYzg5MzkxNDhkYWIwNjlj
-    YTNlZWJlNGYwNWUxYmM3ODA4ZWFiYWMzYWI3ZGVkMTJkZDU5MTU=
+    NWViYmEzMmE5OGQxZGNkZGMzODllOWRjN2ZmNGJmMjcwOTZiOThhYTVkNDE4
+    NTI4NzUxZGRhZmUzOGQ2MDYwMDQ4NWI0OTg0Y2EyZDY2YTUyYmYzMTk4MWYy
+    MGY1MTBhOWFmY2QwMDVkM2QyMTdmZTRmODU5N2MxNjA3MmFhYmM=

data/lib/beaker/dsl/helpers.rb

@@ -926,7 +926,13 @@ module Beaker
         # 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')
+        if agent['platform'] =~ /el-4/
+          # On EL4, the init script does not work correctly with
+          # 'puppet resource service'
+          on agent, "/etc/init.d/#{agent_service} stop"
+        else
+          on agent, puppet_resource('service', agent_service, 'ensure=stopped')
+        end
       end
 
       #stops the puppet agent running on the default host

data/lib/beaker/dsl/install_utils.rb

@@ -149,10 +149,14 @@ module Beaker
       #      on host, "#{installer_cmd(host, opts)} -a #{host['working_dir']}/answers"
       # @api private
       def installer_cmd(host, opts)
-        version = opts[:pe_ver] || host['pe_ver']
+        version = host['pe_ver'] || opts[:pe_ver]
         if host['platform'] =~ /windows/
           version = opts[:pe_ver_win] || host['pe_ver']
           "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /i puppet-enterprise-#{version}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'"
+        elsif host['platform'] =~ /osx/
+          version = host['pe_ver'] || opts[:pe_ver]
+          "cd #{host['working_dir']} && hdiutil attach #{host['dist']}.dmg && installer -pkg /Volumes/puppet-enterprise-#{version}/puppet-enterprise-installer-#{version}.pkg -target /"
+
         # Frictionless install didn't exist pre-3.2.0, so in that case we fall
         # through and do a regular install.
         elsif host['roles'].include? 'frictionless' and ! version_is_less(version, '3.2.0')
@@ -180,15 +184,39 @@ module Beaker
         end
       end
 
+      #Determine the PE package to download/upload on a mac host, download/upload that package onto the host.
+      # Assumed file name format: puppet-enterprise-3.3.0-rc1-559-g97f0833-osx-10.9-x86_64.dmg.
+      # @param [Host] host The mac host to download/upload and unpack PE onto
+      # @param  [Hash{Symbol=>Symbol, String}] opts The options
+      # @option opts [String] :pe_dir Default directory or URL to pull PE package from
+      #                  (Otherwise uses individual hosts pe_dir)
+      # @api private
+      def fetch_puppet_on_mac(host, opts)
+        path = host['pe_dir'] || opts[:pe_dir]
+        local = File.directory?(path)
+        filename = "#{host['dist']}"
+        extension = ".dmg"
+        if local
+          if not File.exists?("#{path}/#{filename}#{extension}")
+            raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
+          end
+          scp_to host, "#{path}/#{filename}#{extension}", "#{host['working_dir']}/#{filename}#{extension}"
+        else
+          if not link_exists?("#{path}/#{filename}#{extension}")
+            raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
+          end
+          on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}"
+        end
+      end
+
       #Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
+      #Assumed file name format: puppet-enterprise-3.3.0-rc1-559-g97f0833.msi
       # @param [Host] host The windows host to download/upload and unpack PE onto
       # @param  [Hash{Symbol=>Symbol, String}] opts The options
       # @option opts [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
-      # @option opts [String] :pe_ver Default PE version to install or upgrade to
+      # @option opts [String] :pe_ver_win Default PE version to install or upgrade to
       #                  (Otherwise uses individual hosts pe_ver)
-      # @option opts [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
-      #                  (Otherwise uses individual Windows hosts pe_ver)
       # @api private
       def fetch_puppet_on_windows(host, opts)
         path = host['pe_dir'] || opts[:pe_dir]
@@ -215,8 +243,6 @@ module Beaker
       # @param  [Hash{Symbol=>Symbol, String}] opts The options
       # @option opts [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
-      # @option opts [String] :pe_ver Default PE version to install or upgrade to
-      #                  (Otherwise uses individual hosts pe_ver)
       # @api private
       def fetch_puppet_on_unix(host, opts)
         path = host['pe_dir'] || opts[:pe_dir]
@@ -262,9 +288,10 @@ module Beaker
           # We install Puppet from the master for frictionless installs, so we don't need to *fetch* anything
           next if host['roles'].include? 'frictionless' and ! version_is_less(opts[:pe_ver] || host['pe_ver'], '3.2.0')
 
-          windows = host['platform'] =~ /windows/
-          if windows
+          if host['platform'] =~ /windows/
             fetch_puppet_on_windows(host, opts)
+          elsif host['platform'] =~ /osx/
+            fetch_puppet_on_mac(host, opts)
           else
             fetch_puppet_on_unix(host, opts)
           end
@@ -311,10 +338,13 @@ module Beaker
         use_all_tar = ENV['PE_USE_ALL_TAR'] == 'true'
         hosts.each do |host|
           host['pe_installer'] ||= 'puppet-enterprise-installer'
-          if host['platform'] !~ /windows/
+          if host['platform'] !~ /windows|osx/
             platform = use_all_tar ? 'all' : host['platform']
             version = host['pe_ver'] || opts[:pe_ver]
             host['dist'] = "puppet-enterprise-#{version}-#{platform}"
+          elsif host['platform'] =~ /osx/
+            version = host['pe_ver'] || opts[:pe_ver]
+            host['dist'] = "puppet-enterprise-#{version}-#{host['platform']}"
           end
           host['working_dir'] = "/tmp/" + Time.new.strftime("%Y-%m-%d_%H.%M.%S") #unique working dirs make me happy
           on host, "mkdir #{host['working_dir']}"
@@ -327,6 +357,13 @@ module Beaker
           next if host == database and host != master and host != dashboard and pre30database
           if host['platform'] =~ /windows/
             on host, installer_cmd(host, opts)
+          elsif host['platform'] =~ /osx/
+            on host, installer_cmd(host, opts)
+            #set the certname and master
+            on host, puppet("config set server #{master}")
+            on host, puppet("config set certname #{host}")
+            #run once to request cert
+            on host, puppet_agent('-t'), :acceptable_exit_codes => [1]
           else
             # We only need answers if we're using the classic installer
             version = host['pe_ver'] || opts[:pe_ver]
@@ -343,7 +380,6 @@ module Beaker
           end
         end
 
-
         # If we're installing a database version less than 3.0, ignore the database host
         install_hosts = hosts.dup
         install_hosts.delete(database) if pre30database and database != master and database != dashboard

data/lib/beaker/version.rb

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

data/spec/beaker/dsl/install_utils_spec.rb

@@ -12,11 +12,15 @@ describe ClassMixedWithDSLInstallUtils do
                                        :platform => 'linux',
                                        :roles => [ 'agent' ] } ) }
   let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
-                         basic_hosts[1][:platform] = 'windows'
-                         basic_hosts  }
+                        basic_hosts[1][:platform] = 'windows'
+                        basic_hosts[2][:platform] = 'osx-10.9-x86_64'
+                        basic_hosts  }
   let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
                                                 :pe_ver => '3.0',
                                                 :working_dir => '/tmp' } ) }
+  let(:machost)       { make_host( 'machost', { :platform => 'osx-10.9-x86_64',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp' } ) }
   let(:unixhost)      { make_host( 'unixhost', { :platform => 'linux',
                                                  :pe_ver => '3.0',
                                                  :working_dir => '/tmp',
@@ -93,7 +97,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'leaves correctly ordered hosts alone' do
       subject.stub( :hosts ).and_return( hosts )
-      expect( subject.sorted_hosts ).to be === hosts 
+      expect( subject.sorted_hosts ).to be === hosts
     end
   end
 
@@ -136,6 +140,12 @@ describe ClassMixedWithDSLInstallUtils do
       the_host['pe_installer'] = 'puppet-enterprise-installer'
       expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp/puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386 && ./puppet-enterprise-installer -a /tmp/answers"
     end
+
+    it 'generates a osx PE install command for a osx host' do
+      the_host = machost.dup
+      the_host['pe_installer'] = 'puppet-enterprise-installer'
+      expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp && hdiutil attach .dmg && installer -pkg /Volumes/puppet-enterprise-3.0/puppet-enterprise-installer-3.0.pkg -target /"
+    end
   end
 
   describe 'fetch_puppet' do
@@ -161,7 +171,7 @@ describe ClassMixedWithDSLInstallUtils do
       subject.stub( :link_exists? ) do |arg|
         if arg =~ /.tar.gz/ #there is no .tar.gz link, only a .tar
           false
-        else          
+        else
           true
         end
       end
@@ -186,7 +196,7 @@ describe ClassMixedWithDSLInstallUtils do
       subject.should_receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
       subject.fetch_puppet( [unixhost], {} )
     end
-     
+
     it 'can push a local PE package to a windows host' do
       File.stub( :directory? ).and_return( true ) #is local
       File.stub( :exists? ).and_return( true ) #is present
@@ -201,6 +211,32 @@ describe ClassMixedWithDSLInstallUtils do
 
     end
 
+    it 'can download a PE dmg from a URL to a mac host' do
+      File.stub( :directory? ).and_return( false ) #is not local
+      machost['pe_dir'] = 'http://www.path.com/dir/'
+      subject.stub( :link_exists? ).and_return( true ) #is  not local
+      subject.stub( :on ).and_return( true )
+
+      path = machost['pe_dir']
+      filename = "#{ machost['dist'] }"
+      extension = '.dmg'
+      subject.should_receive( :on ).with( machost, "cd #{ machost['working_dir'] }; curl -O #{ path }/#{ filename }#{ extension }" ).once
+      subject.fetch_puppet( [machost], {} )
+    end
+
+    it 'can push a PE dmg to a mac host' do
+      File.stub( :directory? ).and_return( true ) #is local
+      machost['pe_dir'] = 'http://www.path.com/dir/'
+      File.stub( :exists? ).and_return( true ) #is present
+      subject.stub( :scp_to ).and_return( true )
+
+      path = machost['pe_dir']
+      filename = "#{ machost['dist'] }"
+      extension = '.dmg'
+      subject.should_receive( :scp_to ).with( machost, "#{ path }/#{ filename }#{ extension }", "#{ machost['working_dir'] }/#{ filename }#{ extension }" ).once
+      subject.fetch_puppet( [machost], {} )
+    end
+
     it "does nothing for a frictionless agent for PE >= 3.2.0" do
       unixhost['roles'] << 'frictionless'
       unixhost['pe_ver'] = '3.2.0'
@@ -220,7 +256,12 @@ describe ClassMixedWithDSLInstallUtils do
       subject.stub( :stop_agent_on ).and_return( true )
       subject.stub( :sleep_until_puppetdb_started ).and_return( true )
       subject.stub( :wait_for_host_in_dashboard ).and_return( true )
-      subject.stub( :puppet_agent ).and_return( "puppet agent" )
+      subject.stub( :puppet_agent ).and_return do |arg|
+        "puppet agent #{arg}"
+      end
+      subject.stub( :puppet ).and_return do |arg|
+        "puppet #{arg}"
+      end
 
       subject.stub( :hosts ).and_return( hosts )
       #determine mastercert
@@ -231,11 +272,14 @@ describe ClassMixedWithDSLInstallUtils do
       subject.should_receive( :on ).with( hosts[2], /mkdir/ ).once
       #create answers file per-host, except windows
       subject.should_receive( :create_remote_file ).with( hosts[0], /answers/, /q/ ).once
-      subject.should_receive( :create_remote_file ).with( hosts[2], /answers/, /q/ ).once
       #run installer on all hosts
       subject.should_receive( :on ).with( hosts[0], /puppet-enterprise-installer/ ).once
       subject.should_receive( :on ).with( hosts[1], /msiexec.exe/ ).once
-      subject.should_receive( :on ).with( hosts[2], /puppet-enterprise-installer/ ).once
+      subject.should_receive( :on ).with( hosts[2], / hdiutil attach puppet-enterprise-3.0-osx-10.9-x86_64.dmg && installer -pkg \/Volumes\/puppet-enterprise-3.0\/puppet-enterprise-installer-3.0.pkg -target \// ).once
+      #does extra mac specific commands
+      subject.should_receive( :on ).with( hosts[2], /puppet config set server/ ).once
+      subject.should_receive( :on ).with( hosts[2], /puppet config set certname/ ).once
+      subject.should_receive( :on ).with( hosts[2], /puppet agent -t/, :acceptable_exit_codes => [1] ).once
       #sign certificate per-host
       subject.should_receive( :sign_certificate_for ).with( hosts[0] ).once
       subject.should_receive( :sign_certificate_for ).with( hosts[1] ).once
@@ -247,9 +291,9 @@ describe ClassMixedWithDSLInstallUtils do
       #wait for puppetdb to start
       subject.should_receive( :sleep_until_puppetdb_started ).with( hosts[0] ).once
       #run each puppet agent once
-      subject.should_receive( :on ).with( hosts[0], /puppet agent/, :acceptable_exit_codes => [0,2] ).once
-      subject.should_receive( :on ).with( hosts[1], /puppet agent/, :acceptable_exit_codes => [0,2] ).once
-      subject.should_receive( :on ).with( hosts[2], /puppet agent/, :acceptable_exit_codes => [0,2] ).once
+      subject.should_receive( :on ).with( hosts[0], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
+      subject.should_receive( :on ).with( hosts[1], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
+      subject.should_receive( :on ).with( hosts[2], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
       #run rake task on dashboard
       subject.should_receive( :on ).with( hosts[0], /\/opt\/puppet\/bin\/rake -sf \/opt\/puppet\/share\/puppet-dashboard\/Rakefile .* RAILS_ENV=production/ ).once
       #wait for all hosts to appear in the dashboard

metadata

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