beaker-pe 2.11.20 → 2.11.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21a476e83cec11a4482e2ef0ad3a98f4ab4c6f8ded3f4f9f29d4bf581a91fb97
-  data.tar.gz: f0896760878018b6d733d6a6064f502ba25fcaf9b4f4fe5590f02e7e1d7f56a2
+  metadata.gz: 527fe6d6360dfb51c8f1e2dbd9f032802b8b41b27f0c46e4ac80e96df585014e
+  data.tar.gz: 7c6a69a2b023551ca1332b2319583fba658536194d228fa29478bf33f906b58c
 SHA512:
-  metadata.gz: 40f9d7178a59bc28ce4a6faf7df20e0a6bf93d8ddd3a7083a0f82c84a6521d35c1570b6ddf7a8634f36dbc6ea317593f708b12ca6d6f837f6919478cce28e1f3
-  data.tar.gz: 5fa09470a51a6564a68f37679900ca2567906db681dc36cca687016d1285de6a2e0b324af5242462d9772112ba7d3928402a99130c37749038b2315d8983f80b
+  metadata.gz: 1626c5e8d6cabd70eadef2c69262f1c3af5364092abe76f395198726c6aa98c86a273308edb2dbd400b3e77647a75f567bb7551d1c7f7e20cf4ed9e1cee958ed
+  data.tar.gz: a9f9764d8fdeaf123d498f90c63b571d7f759ce3b776022640a24dd6e91eefe84d18232ee992ea7cc074694a9c984791e4683f0497b453d34d5d9842fe989611

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.
         #
@@ -726,7 +731,7 @@ module Beaker
           # 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 --waitforlock 1'), :acceptable_exit_codes => [0,2])
+            on(master, puppet_agent("-t #{waitforlock_flag}"), :acceptable_exit_codes => [0,2])
           end
 
           install_agents_only_on(agents, opts)
@@ -977,7 +982,7 @@ module Beaker
               install_hosts.each do |host|
                 # 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]
+                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,
@@ -1018,7 +1023,7 @@ module Beaker
               install_hosts.each do |host|
                 # 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]
+                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
@@ -2123,7 +2128,7 @@ EOM
              # 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 --waitforlock 1'), :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.20'
+        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.20
+  version: 2.11.21
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec