beaker-pe 1.16.0 → 1.17.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjg5OTg2MGZkMzdlYzY5ZTljN2JkMWY2NmFmNGI4ZDQxZDZmMGQ2OA==
+    MmJmODQ3NWQwNmU1YzgwOWYyMTEzZTA5NTA0NjM5YmZlMmNmYWVmNA==
   data.tar.gz: !binary |-
-    NGQyNmZiMzU3MTAyZTY1MTYwYTE2NTNkZmMxYzI1ZDc1Yzk1NzM1Nw==
+    MWZhMGY3Y2YxMzhhNTYwZGRhNjk3MTkzYWFhNzcxMDYzOGM0MzEyMg==
 SHA512:
   metadata.gz: !binary |-
-    NTk0NTliMmU2ZTJhNDdmNmQ2NGU1ODBmZjZjNjc5NGY2OGVmZmY1YzQyYTZm
-    NmFmM2ViMzNjYTMwOTNkZmE1MDQ5YjAwNmZjMmZhNzQ4N2U5MGVhODRiOGY5
-    MGRjNmViZDdjY2Y5MWQ2ZDQ4NGE2OWVkMTcyNTA1NTdiZGZlMDM=
+    NDk4ZjM1MGY3NGE1NDAxMjZjOWNiNDAxNmIzYzNkNWEwNzhhNzY2MDdkNWM2
+    ZDJkMjczOTczZjAzNTg1YzdmODRhZGZlMmYyNmMyMGVhOTE4OWI4Y2RhNWI5
+    NmMyMWY0NWY4NDY2Y2E4NmU5YmI5MGRkZmY5ZjVkMTQ2NzY3YTE=
   data.tar.gz: !binary |-
-    OTgyNDI0ZjQxNGYxNWI5MzZmNTA0NzA5MjJkMmUzY2UwMmNhOTBjNjNhMGQx
-    OTI3Y2JiYThmNDFhMDkxYjZjMGM5NjI5ZWU5NWY2MjkxYmFjNWMzZDdjMTc2
-    M2I1Yzk1NzUyNDA0YzM5N2YyZjU2OTFjODc3OWU0MTY4ZWRiZDk=
+    MjBiNWIwNWQ0Y2Q0M2I4YjkzNDYzNWUyYTU2ZTU0NzEwNmRmOTljZTM2MWYx
+    NjJlZmZmZjI5MzY4YTYwNThjYzI0Y2ZkZWU5OWI4ZDk5MzI2NTVmMzdlNDUw
+    YTFhNzUxZTBlN2QxODU0NDkxNWRiYmY0ZmE1ZTZhMmI2ZmViOGU=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # worker - History
 ## Tags
-* [LATEST - 26 May, 2017 (053b1ab7)](#LATEST)
+* [LATEST - 7 Jun, 2017 (544c8585)](#LATEST)
+* [1.16.0 - 26 May, 2017 (f8218db6)](#1.16.0)
 * [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)
@@ -39,7 +40,57 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 26 May, 2017 (053b1ab7)
+### <a name = "LATEST">LATEST - 7 Jun, 2017 (544c8585)
+
+* (GEM) update beaker-pe version to 1.17.0 (544c8585)
+
+* Merge pull request #74 from ericwilliamson/bug/master/qeng-5040-run-puppet-after-mono-install (6958c093)
+
+
+```
+Merge pull request #74 from ericwilliamson/bug/master/qeng-5040-run-puppet-after-mono-install
+
+(QENG-5040) Run puppet after simplified mono install
+```
+* Merge pull request #73 from samwoods1/maint (cf2ad914)
+
+
+```
+Merge pull request #73 from samwoods1/maint
+
+(maint) Fix parallel agent install
+```
+* (QENG-5040) Run puppet after simplified mono install (01b9617d)
+
+
+```
+(QENG-5040) Run puppet after simplified mono install
+
+Previous to this commit, the new simplified mono install method was not
+running puppet on the master node in a mono only scenario. If the
+install included agents not of the masters OS, then puppet would of been
+ran due to needing to add pe_repo classes. In the scenario of mono
+master only, if puppet is not ran, then setup is not considered complete
+due to exported resources, mcollective and facts not being setup yet.
+This would cause numerous issues, such as no facts in puppetdb (so
+anyaltic tests for example would fail) until a test somewhere in the
+pipeline ran puppet agent on the master node.
+This commit adds a call outside of the parallel agent run on non infra
+agents due to the fact that with exported resources, the classifier
+service will restart, so need to run the master first, then after that
+all the agents can run.
+```
+* (maint) Fix parallel agent install (19c1e64a)
+
+
+```
+(maint) Fix parallel agent install
+Parallel agent installs have been broken since f9cb3ca802ddc94a9a42dcbcfef96f7a76a19dff because the install command contained a working_dir that was unique per host.
+This fixes that issue and also allows all agents to be installed in parallel regardless of OS or unique installer_cmd
+```
+### <a name = "1.16.0">1.16.0 - 26 May, 2017 (f8218db6)
+
+* (HISTORY) update beaker-pe history for gem release 1.16.0 (f8218db6)
 
 * (GEM) update beaker-pe version to 1.16.0 (053b1ab7)
 

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

@@ -470,8 +470,8 @@ module Beaker
           end
 
           step "Install agents" do
-            agents.group_by {|agent| installer_cmd(agent, opts)}.each do |cmd, agents|
-              on agents, cmd, :run_in_parallel => true
+            block_on(agents, {:run_in_parallel => true}) do |host|
+              on(host, installer_cmd(host, opts))
             end
           end
 
@@ -485,6 +485,7 @@ module Beaker
           end
 
           step "Run puppet to setup mcollective and pxp-agent" do
+            on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
             run_puppet_on_non_infrastructure_nodes(all_hosts)
 
             #Workaround for windows frictionless install, see BKR-943 for the reason

data/lib/beaker-pe/version.rb

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

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

@@ -1357,14 +1357,13 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs on the master then on the agents' do
       expect(subject).to receive(:on).with(monolithic, "install master").ordered
-      expect(subject).to receive(:on).with([el_agent, el_agent], "install el agent", anything()).ordered
+      expect(subject).to receive(:block_on).with([el_agent, el_agent], :run_in_parallel => true).ordered
 
       subject.simple_monolithic_install(monolithic, [el_agent, el_agent])
     end
 
-    it 'installs agents in parallel if their install command is the same' do
-      expect(subject).to receive(:on).with([el_agent, el_agent], "install el agent", :run_in_parallel => true)
-      expect(subject).to receive(:on).with([deb_agent, deb_agent], "install deb agent", :run_in_parallel => true)
+    it 'installs agents in parallel' do
+      expect(subject).to receive(:block_on).with([el_agent, el_agent, deb_agent, deb_agent], :run_in_parallel => true)
 
       subject.simple_monolithic_install(monolithic, [el_agent, el_agent, deb_agent, deb_agent])
     end

metadata

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