beaker 2.14.0 → 2.14.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGI1NGE4MGQ2YjczY2E2OGM0M2Y5NzI3MTAzNjU1MDFlZmEyOThlNg==
+    ZDI1NWRkYzBiZmZlOWEwMTY0NjRlNGJjYzcwMDM5MzZhNWFlNDk0Mg==
   data.tar.gz: !binary |-
-    NzMyYWI5YjU0ZmNlZDE5NDliYWUyNzBjZTQ3MDIzZmU1YTgyOTEwNw==
+    OTg5MjdmOTFlZjY0NjVhZGYxNjQ3M2QwYzg5ZGQ0MzA0MTAyNjdjNQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2IyZGJiMmQxMmI0Yzk4Mjk4ZmQ4NmJjMzc3ZmIxMzcyMzhhM2M4YjY1MDEx
-    MDY1NWE4NWNjNmUyZTg5YzNmZTNhYmRiNGNkMjFhZWU2MzI1MTljMmZmODY0
-    ZTJhOGMzNWU0MWYzYTdiNDdjMTg2Zjg4ZDQ1MTE2OTRiMDhjNjc=
+    NzUyZTA5Mzc1MjgyODA1ODg1ZjNjYThjZWY2YTg4NDgwYmM4NGQ2M2RiNTVh
+    NTAyYzEyZGY0ODlhY2Y5ZTRiZjVmNjJkOGRmZDE4ZjhhYTY4NTQwOTBlOGY4
+    MzEyMGU0OTUyZmEyZmMzYTRkYWEyYTljZGIxMjk2MWVlNDM2OWY=
   data.tar.gz: !binary |-
-    NTgyZDY4NjRlNTA4NzU1MzUxYWIyMmZlZGVkNDI3YjlmYzE3MWU2Mzc4MDM3
-    YmI3OWJmMmVlMThlMTg5MGUyMjZkODc2OGQwOWQ4MzcwZWI0ZmNjNjk2NGE3
-    ZGE3MzI4ZmQ4MjNmMGUwNGMzZTIxNWE5Y2Y3ZmE3ODZlNTU2OTU=
+    MWU2YmQ1N2M5OWExZjVlZmUyZTYwOWU0MDkwYTFiZTIxYmVmODBhOTI3ZWM5
+    M2RhN2M1ZDMwNjg5Mjc1ZDAyMWFiZDBlMDVlMTUwYWE4YTQzYTM0NDBhMmZl
+    YTAxNjllMjcwMGE3NjhhNDJmNDA0OWNkMGY3NzFkYTYzNDQzYjg=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 4 Jun, 2015 (656f30be)](#LATEST)
+* [LATEST - 5 Jun, 2015 (8539687f)](#LATEST)
+* [2.14.0 - 4 Jun, 2015 (c0ebcd16)](#2.14.0)
 * [2.13.0 - 29 May, 2015 (dd70aa66)](#2.13.0)
 * [2.12.0 - 20 May, 2015 (62845ce9)](#2.12.0)
 * [2.11.0 - 6 May, 2015 (b775cc73)](#2.11.0)
@@ -82,7 +83,41 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 4 Jun, 2015 (656f30be)
+### <a name = "LATEST">LATEST - 5 Jun, 2015 (8539687f)
+
+* (GEM) update beaker version to 2.14.1 (8539687f)
+
+* Merge pull request #842 from anodelman/fix-puppetservice-default (28a4ef9c)
+
+
+```
+Merge pull request #842 from anodelman/fix-puppetservice-default
+
+(BKR-313) Beaker is using pe-httpd as the puppet master service...
+```
+* Merge pull request #841 from kevpl/bkr295_ubuntu_stopagenton_fix (eb8cc39c)
+
+
+```
+Merge pull request #841 from kevpl/bkr295_ubuntu_stopagenton_fix
+
+(BKR-295) use 'puppet' in stop_agent_on for 4.0+
+```
+* (BKR-313) Beaker is using pe-httpd as the puppet master service... (a27eb5ae)
+
+
+```
+(BKR-313) Beaker is using pe-httpd as the puppet master service...
+
+... in method 'with_puppet_running_on'
+
+- use pe-httpd pre 3.4, pe-puppetserver post 3.4
+```
+* (BKR-295) use 'puppet' in stop_agent_on for 4.0+ (9604315c)
+
+### <a name = "2.14.0">2.14.0 - 4 Jun, 2015 (c0ebcd16)
+
+* (HISTORY) update beaker history for gem release 2.14.0 (c0ebcd16)
 
 * (GEM) update beaker version to 2.14.0 (656f30be)
 

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

@@ -606,6 +606,8 @@ module Beaker
             # that if the script doesn't exist, we should just use `pe-puppet`
             agent_service = 'pe-puppet-agent'
             agent_service = 'pe-puppet' unless agent.file_exist?('/etc/init.d/pe-puppet-agent')
+            # In 4.0 this was changed to just be `puppet`
+            agent_service = 'puppet' unless version_is_less(agent['pe_ver'], '4.0')
 
             # Under a number of stupid circumstances, we can't stop the
             # agent using puppet.  This is usually because of issues with

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

@@ -79,6 +79,12 @@ module Beaker
             host['group'] = 'pe-puppet'
           end
           host['type'] = 'pe'
+          # newer pe requires a different puppetservice name, set it here on the master
+          if host['roles'].include?('master')
+            if host['pe_ver'] and (not version_is_less(host['pe_ver'], '3.4'))
+              host['puppetservice'] = 'pe-puppetserver'
+            end
+          end
         end
 
         # Add the appropriate pe defaults to an array of hosts

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

@@ -359,10 +359,6 @@ module Beaker
           unless masterless
             pre30database = version_is_less(opts[:pe_ver] || database['pe_ver'], '3.0')
             pre30master = version_is_less(opts[:pe_ver] || master['pe_ver'], '3.0')
-
-            unless version_is_less(opts[:pe_ver] || master['pe_ver'], '3.4')
-              master['puppetservice'] = 'pe-puppetserver'
-            end
           end
 
           # Set PE distribution for all the hosts, create working dir

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.14.0'
+    STRING = '2.14.1'
   end
 end

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

@@ -361,7 +361,7 @@ describe ClassMixedWithDSLHelpers 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 = make_host( 'deb', :platform => 'debian-7-amd64', :pe_ver => '3.7' )
       allow( deb_agent ).to receive( :puppet ).and_return( { 'vardir' => vardir } )
 
       expect( deb_agent ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
@@ -376,7 +376,7 @@ describe ClassMixedWithDSLHelpers do
 
     it 'runs the pe-puppet-agent on a unix system with pe-puppet-agent' do
       vardir = '/var'
-      el_agent = make_host( 'el', :platform => 'el-5-x86_64' )
+      el_agent = make_host( 'el', :platform => 'el-5-x86_64', :pe_ver => '3.7' )
       allow( el_agent ).to receive( :puppet ).and_return( { 'vardir' => vardir } )
 
       expect( el_agent ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
@@ -388,6 +388,20 @@ describe ClassMixedWithDSLHelpers do
       subject.stop_agent_on( el_agent )
     end
 
+    it 'runs puppet on a unix system 4.0 or newer' do
+      vardir = '/var'
+      el_agent = make_host( 'el', :platform => 'el-5-x86_64', :pe_ver => '4.0' )
+      allow( el_agent ).to receive( :puppet ).and_return( { 'vardir' => vardir } )
+
+      expect( el_agent ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
+      expect( el_agent ).to receive( :file_exist? ).with("/etc/init.d/pe-puppet-agent").and_return(true)
+
+      expect( subject ).to receive( :puppet_resource ).with( "service", "puppet", "ensure=stopped").once
+      expect( subject ).to receive( :on ).once
+
+      subject.stop_agent_on( el_agent )
+    end
+
   end
 
   describe "#stop_agent" do

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

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+class ClassMixedWithDSLInstallUtils
+  include Beaker::DSL::InstallUtils
+  include Beaker::DSL::Wrappers
+  include Beaker::DSL::Helpers
+  include Beaker::DSL::Structure
+  include Beaker::DSL::Roles
+  include Beaker::DSL::Patterns
+
+  attr_accessor :hosts
+
+  def logger
+    @logger ||= RSpec::Mocks::Double.new('logger').as_null_object
+  end
+end
+
+describe ClassMixedWithDSLInstallUtils do
+  let(:presets)       { Beaker::Options::Presets.new }
+  let(:opts)          { presets.presets.merge(presets.env_vars) }
+  let(:basic_hosts)   { make_hosts( { :pe_ver => @pe_ver || '3.0',
+                                       :platform => 'linux',
+                                       :roles => [ 'agent' ] }, 4 ) }
+  let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
+                        basic_hosts[1][:platform] = 'windows'
+                        basic_hosts[2][:platform] = 'osx-10.9-x86_64'
+                        basic_hosts[3][:platform] = 'eos'
+                        basic_hosts  }
+  let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3] ] }
+  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',
+                                                 :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386' } ) }
+  let(:eoshost)       { make_host( 'eoshost', { :platform => 'eos',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp',
+                                                :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
+
+  describe '#add_platform_pe_defaults' do
+    it 'sets puppetservice on master to be pe-httpd on pre-3.4 pe' do
+      @pe_ver = '3.3'
+      subject.add_platform_pe_defaults(hosts[0], 'unix')
+      expect(hosts[0]['puppetservice']).to be == 'pe-httpd'
+
+    end
+
+    it 'sets puppetservice on master to be pe-puppetserver on post-3.4 pe' do
+      @pe_ver = '3.7'
+      subject.add_platform_pe_defaults(hosts[0], 'unix')
+      expect(hosts[0]['puppetservice']).to be == 'pe-puppetserver'
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Puppetlabs
@@ -516,6 +516,7 @@ files:
 - spec/beaker/dsl/helpers/web_helpers_spec.rb
 - spec/beaker/dsl/install_utils/foss_utils_spec.rb
 - spec/beaker/dsl/install_utils/module_utils_spec.rb
+- spec/beaker/dsl/install_utils/pe_defaults_spec.rb
 - spec/beaker/dsl/install_utils/pe_utils_spec.rb
 - spec/beaker/dsl/outcomes_spec.rb
 - spec/beaker/dsl/roles_spec.rb