beaker-pe 2.11.18 → 2.11.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1413bb33ad2872c13f73139d7c84890259cc831db06d0d34b93e98f3f86416
-  data.tar.gz: 945f17cf188d4a0eaf282da3db6e0a851397fcd177d74fc43c184a3e5418e9e6
+  metadata.gz: 21a476e83cec11a4482e2ef0ad3a98f4ab4c6f8ded3f4f9f29d4bf581a91fb97
+  data.tar.gz: f0896760878018b6d733d6a6064f502ba25fcaf9b4f4fe5590f02e7e1d7f56a2
 SHA512:
-  metadata.gz: f9214eb375767886803d62479a46a86d5dcce7531be74124bac6a3c3f352ab3e59fe67c2b22b77dc6414d959e02562c24eee88f7c208bfea996d1123f9367513
-  data.tar.gz: ca87fd01f4350efc2b5bf7438215b443ee06f2215ed2edbddf6d31f691bbdc22bf7ac85a3a55f31fa6351d58bffc9c250a8b7242220af82173b01e5f3d2dbc96
+  metadata.gz: 40f9d7178a59bc28ce4a6faf7df20e0a6bf93d8ddd3a7083a0f82c84a6521d35c1570b6ddf7a8634f36dbc6ea317593f708b12ca6d6f837f6919478cce28e1f3
+  data.tar.gz: 5fa09470a51a6564a68f37679900ca2567906db681dc36cca687016d1285de6a2e0b324af5242462d9772112ba7d3928402a99130c37749038b2315d8983f80b

data/CODEOWNERS

@@ -1,5 +1,5 @@
-#This Repository is maintained by both the beaker, installer, and Night's Watch teams, depending on the location of the changes
-* @puppetlabs/dio
+#This Repository is maintained by both the release engineering, and installer teams, depending on the location of the changes
+*  @puppetlabs/release-engineering
 /lib/beaker-pe/install @puppetlabs/installer-and-management
-/lib/beaker-pe/pe-client-tools @puppetlabs/night-s-watch
+/lib/beaker-pe/pe-client-tools @puppetlabs/installer-and-management
 /spec/beaker-pe/install @puppetlabs/installer-and-management

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

@@ -258,6 +258,9 @@ module Beaker
               pe_cmd += " -y"
             end
 
+            configure_flags = host['configure_flags'] || opts[:configure_flags]
+            pe_cmd += " -- #{configure_flags}" if configure_flags
+
             # If we are doing an upgrade from 2016.2.0,
             # we can assume there will be a valid pe.conf in /etc that we can re-use.
             # We also expect that any custom_answers specified to beaker have been
@@ -720,8 +723,10 @@ module Beaker
             configure_puppet_agent_service(:ensure => 'stopped', :enabled => false)
           end
 
+          # waitforlock in case stopping the agent run after stopping the agent service
+          # takes a little longer than usual
           step "Run puppet to setup mcollective and pxp-agent" do
-            on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
+            on(master, puppet_agent('-t --waitforlock 1'), :acceptable_exit_codes => [0,2])
           end
 
           install_agents_only_on(agents, opts)
@@ -970,7 +975,9 @@ module Beaker
             step "First puppet agent run" do
               # Run the agent once to ensure everything is in the dashboard
               install_hosts.each do |host|
-                on host, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
+                # waitforlock in case stopping the agent run after stopping the agent service
+                # takes a little longer than usual
+                on host, puppet_agent('-t --waitforlock 1'), :acceptable_exit_codes => [0,2]
 
                 # Workaround for PE-1105 when deploying 3.0.0
                 # The installer did not respect our database host answers in 3.0.0,
@@ -1009,7 +1016,9 @@ module Beaker
               # Now that all hosts are in the dashbaord, run puppet one more
               # time to configure mcollective
               install_hosts.each do |host|
-                on host, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
+                # waitforlock in case stopping the agent run after stopping the agent service
+                # takes a little longer than usual
+                on host, puppet_agent('-t --waitforlock 1'), :acceptable_exit_codes => [0,2]
                 # To work around PE-14318 if we just ran puppet agent on the
                 # database node we will need to wait until puppetdb is up and
                 # running before continuing
@@ -2111,8 +2120,10 @@ EOM
                stop_agent_on(agent_nodes, :run_in_parallel => true)
              end
 
+             # waitforlock in case stopping the agent run after stopping the agent service
+             # takes a little longer than usual
              step "Run puppet on all agent nodes" do
-               on agent_nodes, puppet_agent('-t'), :acceptable_exit_codes => [0,2], :run_in_parallel => true
+               on agent_nodes, puppet_agent('-t --waitforlock 1'), :acceptable_exit_codes => [0,2], :run_in_parallel => true
              end
 
              #Workaround for windows frictionless install, see BKR-943

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.18'
+        STRING = '2.11.20'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.18
+  version: 2.11.20
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec