beaker-pe 2.11.19 → 2.11.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a086021092d8858a631836bf5748c9af05c634aaf8f592779f5dd410754297
-  data.tar.gz: d6550eea50d3e8e0dc8a5d2370ba01ba3b90195a49ede9254e5842c91d15863e
+  metadata.gz: 527fe6d6360dfb51c8f1e2dbd9f032802b8b41b27f0c46e4ac80e96df585014e
+  data.tar.gz: 7c6a69a2b023551ca1332b2319583fba658536194d228fa29478bf33f906b58c
 SHA512:
-  metadata.gz: a074dd641c52eda075571a15c4d3370f2111af27b2c776d4b68d9d236a6c4bee2a702531c062907b2f51a0d48133001065e9b94bda155e4e7a0376b46010c4d2
-  data.tar.gz: 73a32f29d7a216d9de17e2175b6b77e8938ac414bbcbe1292195069f83274b1649bf79f24634e4526930c0297bea240f1292dc169da9a6b3efd5fe11ccdf95bf
+  metadata.gz: 1626c5e8d6cabd70eadef2c69262f1c3af5364092abe76f395198726c6aa98c86a273308edb2dbd400b3e77647a75f567bb7551d1c7f7e20cf4ed9e1cee958ed
+  data.tar.gz: a9f9764d8fdeaf123d498f90c63b571d7f759ce3b776022640a24dd6e91eefe84d18232ee992ea7cc074694a9c984791e4683f0497b453d34d5d9842fe989611

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

@@ -143,6 +143,11 @@ module Beaker
           return tlsv1_platforms.any? {|platform_regex| host['platform'] =~ platform_regex}
         end
 
+        #Return '--waitforlock 1' if the agent is >= 6.16 which was used in 2019.8.0.
+        def waitforlock_flag
+          version_is_less(master['pe_ver'], '2019.8.0') ? '' : '--waitforlock 1'
+        end
+
         # Generate the command line string needed to from a frictionless puppet-agent
         # install on this host in a PE environment.
         #
@@ -723,8 +728,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_flag}"), :acceptable_exit_codes => [0,2])
           end
 
           install_agents_only_on(agents, opts)
@@ -973,7 +980,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_flag}"), :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,
@@ -1012,7 +1021,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_flag}"), :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
@@ -2114,8 +2125,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_flag}"), :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.19'
+        STRING = '2.11.21'
       end
 
     end

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

@@ -1969,6 +1969,7 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:generate_installer_conf_file_for)
       allow(subject).to receive(:deploy_frictionless_to_master)
       allow(subject).to receive(:install_agents_only_on)
+      allow(subject).to receive(:waitforlock_flag).and_return('')
 
       allow(subject).to receive(:installer_cmd).with(monolithic, anything()).and_return("install master")
       allow(subject).to receive(:installer_cmd).with(el_agent, anything()).and_return("install el agent")

metadata

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