beaker-pe 1.15.0 → 1.16.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDU3YmFiNDg4M2FjMzYwNzRmNzI1NDdjZTcyY2NjNmJlNWQyOTllMw==
+    Yjg5OTg2MGZkMzdlYzY5ZTljN2JkMWY2NmFmNGI4ZDQxZDZmMGQ2OA==
   data.tar.gz: !binary |-
-    Y2I2MDdlZDY2YTJmNWFiY2VlODFkZDJiMDhjMzdlYTJkZjU0OTAyMg==
+    NGQyNmZiMzU3MTAyZTY1MTYwYTE2NTNkZmMxYzI1ZDc1Yzk1NzM1Nw==
 SHA512:
   metadata.gz: !binary |-
-    MWUyNGExOTQ3NmVjMGE2NmEwZmYwOGYzZjUxZTU0NTQwOTcwZTUyNzgxODU5
-    ZmFmOTY0ODczMzFlNjlmZWUxMzRlNDFmMDUyZGIwOGY0ZDE3OWUwMWRkYzc4
-    MzhjMTUyYmM5NjdjZjEyNTFiMTk5NTVmNzkwZTJjZDcyNTA4OGE=
+    NTk0NTliMmU2ZTJhNDdmNmQ2NGU1ODBmZjZjNjc5NGY2OGVmZmY1YzQyYTZm
+    NmFmM2ViMzNjYTMwOTNkZmE1MDQ5YjAwNmZjMmZhNzQ4N2U5MGVhODRiOGY5
+    MGRjNmViZDdjY2Y5MWQ2ZDQ4NGE2OWVkMTcyNTA1NTdiZGZlMDM=
   data.tar.gz: !binary |-
-    MGViNDFmZDI4OGExNTVkZmU3ZDlhMDA2ZGZlOThmZWFhMzkxODE2YmNhYjBm
-    MmJkZTZjNmQ1NGQxMzAzM2Q0MWM2YzYzZjJiNWFlMmJmZTMyMmVkMzA3OGY1
-    MzE3ZWQzMGE4ODdjNmE3NWU4MDE5MDE4OWVhN2VkZWQzNmFlZjc=
+    OTgyNDI0ZjQxNGYxNWI5MzZmNTA0NzA5MjJkMmUzY2UwMmNhOTBjNjNhMGQx
+    OTI3Y2JiYThmNDFhMDkxYjZjMGM5NjI5ZWU5NWY2MjkxYmFjNWMzZDdjMTc2
+    M2I1Yzk1NzUyNDA0YzM5N2YyZjU2OTFjODc3OWU0MTY4ZWRiZDk=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # worker - History
 ## Tags
-* [LATEST - 11 May, 2017 (6cdb9055)](#LATEST)
+* [LATEST - 26 May, 2017 (053b1ab7)](#LATEST)
+* [1.15.0 - 11 May, 2017 (0fddaad5)](#1.15.0)
 * [1.14.0 - 10 May, 2017 (874a7998)](#1.14.0)
 * [1.13.0 - 6 Apr, 2017 (a3c5d641)](#1.13.0)
 * [1.12.1 - 29 Mar, 2017 (fe8bbc82)](#1.12.1)
@@ -38,7 +39,38 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 11 May, 2017 (6cdb9055)
+### <a name = "LATEST">LATEST - 26 May, 2017 (053b1ab7)
+
+* (GEM) update beaker-pe version to 1.16.0 (053b1ab7)
+
+* PE-20610 Fix install failure on windows for old pe versions (6c5c6143)
+
+
+```
+PE-20610 Fix install failure on windows for old pe versions
+
+Added logic to use the old generic_install method on windows when
+installing old pe versions that requires an msi install because of
+powershell2 issue PE-18351. The newly added simple_monolithic_install
+does not have a check for those conditions and proceeds with
+frictionless installation on those hosts which fails.
+```
+* (PE-20589) After a simple monolithic install run puppet on non-infrastructure agents (d69499ee)
+
+
+```
+(PE-20589) After a simple monolithic install run puppet on non-infrastructure agents
+
+Previously after agents were installed via simple mono install, we ran the agents
+all at once. This include the master. Occasionaly there would be a change done to
+the console services that would require a restart.
+This would cause other agent runs to fail. So to not have that happen, we will run
+only the non-infrastructure agents. That should be fine since part of the process
+of installing PE should have the puppet runs included there.
+```
+### <a name = "1.15.0">1.15.0 - 11 May, 2017 (0fddaad5)
+
+* (HISTORY) update beaker-pe history for gem release 1.15.0 (0fddaad5)
 
 * (GEM) update beaker-pe version to 1.15.0 (6cdb9055)
 

data/lib/beaker-pe/install/pe_utils.rb

@@ -423,6 +423,8 @@ module Beaker
           return :generic if hosts.map {|host| host['pe_ver']}.uniq.length > 1
           return :generic if opts[:type] == :upgrade
           return :generic if version_is_less(opts[:pe_ver] || hosts.first['pe_ver'], '2016.4')
+          #PE-20610 Do a generic install for old versions on windows that needs msi install because of PE-18351
+          return :generic if hosts.any? {|host| host['platform'] =~ /windows/ && install_via_msi?(host)}
 
           mono_roles = ['master', 'database', 'dashboard']
           if has_all_roles?(hosts.first, mono_roles) && hosts.drop(1).all? {|host| host['roles'].include?('frictionless')}
@@ -483,7 +485,7 @@ module Beaker
           end
 
           step "Run puppet to setup mcollective and pxp-agent" do
-            on all_hosts, puppet_agent('-t'), :acceptable_exit_codes => [0,2], :run_in_parallel => true
+            run_puppet_on_non_infrastructure_nodes(all_hosts)
 
             #Workaround for windows frictionless install, see BKR-943 for the reason
             agents.select {|agent| agent['platform'] =~ /windows/}.each do |agent|
@@ -771,6 +773,14 @@ module Beaker
             (host['platform'] =~ /windows-2008r2/ && (!version_is_less(host['pe_ver'], '2016.4.99') && version_is_less(host['pe_ver'], '2016.5.99') && !version_is_less(host['pe_ver'], '3.99')))
         end
 
+        # Runs puppet on all nodes, unless they have the roles: master,database,console/dashboard
+        # @param [Array<Host>] hosts The sorted hosts to install or upgrade PE on
+        def run_puppet_on_non_infrastructure_nodes(all_hosts)
+          pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'dashboard', 'database']}, all_hosts)
+          non_infrastructure = all_hosts.reject{|host| pe_infrastructure.include? host}
+          on non_infrastructure, puppet_agent('-t'), :acceptable_exit_codes => [0,2], :run_in_parallel => true
+        end
+
         # True if version is greater than or equal to MEEP_CLASSIFICATION_VERSION
         # (PE-18718) AND the temporary feature flag is true.
         #

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.15.0'
+        STRING = '1.16.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -254,6 +254,27 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe 'run_puppet_on_non_infrastructure_nodes' do
+    let(:monolithic) { make_host('monolithic', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => [ 'master', 'database', 'dashboard' ]) }
+    let(:el_agent) { make_host('agent', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => ['frictionless']) }
+    let(:deb_agent) { make_host('agent', :pe_ver => '2016.4', :platform => 'debian-7-x86_64', :roles => ['frictionless']) }
+    let(:master) { make_host('master', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => [ 'master']) }
+    let(:database) { make_host('database', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => [ 'database']) }
+    let(:dashboard) { make_host('dashboard', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => [ 'dashboard']) }
+    it 'runs puppet on non-infra nodes with a monolithic master' do
+      expect(subject).to receive(:on).with([el_agent, deb_agent], proc {|cmd| cmd.command == "puppet agent"}, hash_including(:run_in_parallel => true)).once
+      expect(subject).to receive(:on).with([monolithic], proc {|cmd| cmd.command == "puppet agent"}, hash_including(:run_in_parallel => true)).never
+      subject.run_puppet_on_non_infrastructure_nodes([monolithic, el_agent, deb_agent])
+    end
+    it 'runs puppet on non-infra nodes with a split topology' do
+      expect(subject).to receive(:on).with([el_agent, deb_agent], proc {|cmd| cmd.command == "puppet agent"}, hash_including(:run_in_parallel => true)).once
+      expect(subject).to receive(:on).with([master], proc {|cmd| cmd.command == "puppet agent"}, hash_including(:run_in_parallel => true)).never
+      expect(subject).to receive(:on).with([database], proc {|cmd| cmd.command == "puppet agent"}, hash_including(:run_in_parallel => true)).never
+      expect(subject).to receive(:on).with([dashboard], proc {|cmd| cmd.command == "puppet agent"}, hash_including(:run_in_parallel => true)).never
+      subject.run_puppet_on_non_infrastructure_nodes([master, database, dashboard, el_agent, deb_agent])
+    end
+  end
+
   describe 'install_via_msi?' do
     it 'returns true if pe_version is before PE 2016.4.0' do
       the_host = winhost.dup
@@ -943,6 +964,11 @@ describe ClassMixedWithDSLInstallUtils do
       hosts = [monolithic, master, agent, agent, agent]
       expect(subject.determine_install_type(hosts, {})).to eq(:generic)
     end
+    it 'identifies an install that requires windows msi install as generic' do
+      win_agent = make_host('agent', :pe_ver => '2016.4.0', :platform => 'win-2008r2', :roles => ['frictionless'])
+      hosts = [monolithic, agent, win_agent]
+      expect(subject.determine_install_type(hosts, {})).to eq(:generic)
+    end
   end
 
   describe '#deploy_frictionless_to_master' do
@@ -1351,13 +1377,6 @@ describe ClassMixedWithDSLInstallUtils do
       subject.simple_monolithic_install(monolithic, agents)
     end
 
-    it 'runs agents in parallel, only one time' do
-      agents = [el_agent, el_agent, deb_agent, deb_agent]
-      expect(subject).to receive(:on).with([monolithic, *agents], proc {|cmd| cmd.command == "puppet agent"}, hash_including(:run_in_parallel => true)).once
-
-      subject.simple_monolithic_install(monolithic, agents)
-    end
-
     it "calls prepare_hosts on all hosts instead of just master" do
       expect(subject).to receive(:prepare_hosts).with([monolithic] + [el_agent, el_agent, el_agent], {})
       subject.simple_monolithic_install(monolithic, [el_agent, el_agent, el_agent])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec