beaker-pe 2.11.20 → 2.11.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21a476e83cec11a4482e2ef0ad3a98f4ab4c6f8ded3f4f9f29d4bf581a91fb97
-  data.tar.gz: f0896760878018b6d733d6a6064f502ba25fcaf9b4f4fe5590f02e7e1d7f56a2
+  metadata.gz: 11cedfa7e51e26dc8c86bba1f90f58246281a4ecd807bf478257faf65ab6222a
+  data.tar.gz: 11aa7c6788e083087b365f3ece9c776152192729620d7c445991f28321daf10f
 SHA512:
-  metadata.gz: 40f9d7178a59bc28ce4a6faf7df20e0a6bf93d8ddd3a7083a0f82c84a6521d35c1570b6ddf7a8634f36dbc6ea317593f708b12ca6d6f837f6919478cce28e1f3
-  data.tar.gz: 5fa09470a51a6564a68f37679900ca2567906db681dc36cca687016d1285de6a2e0b324af5242462d9772112ba7d3928402a99130c37749038b2315d8983f80b
+  metadata.gz: f4b5e2f23e69e501026ac935cbf9d1f921f9bcc46c1547a192f89a7dcb83b867f3e24390ce270740b82fb40a8709340b74ec9ac2a1fefa7590b287b25f540df8
+  data.tar.gz: 9d98e876622f630b5d300c12e4a19cf8dbe08b4ba0a44cb5ec45f6bcc5c21d9c6af6d24bbd024b5c0da9688182364f7528fc9cf185efce9d8c96a9a68d8044d7

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

@@ -143,6 +143,20 @@ 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.
+        #In the test running with legacy agents, the pe_ver value on that host
+        #corresponds to the PE version the old agent comes from. Also, puppet_agent_version
+        #is present on these host objects.
+        def waitforlock_flag(host)
+          agent_version = host['puppet_agent_version']
+          pe_ver = host['pe_ver']
+          if (agent_version && version_is_less(agent_version, '6.16.0')) || version_is_less(host['pe_ver'], '2019.8.0')
+            ''
+          else
+            '--waitforlock 1'
+          end
+        end
+
         # Generate the command line string needed to from a frictionless puppet-agent
         # install on this host in a PE environment.
         #
@@ -726,7 +740,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(master)}"), :acceptable_exit_codes => [0,2])
           end
 
           install_agents_only_on(agents, opts)
@@ -977,7 +991,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(host)}"), :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 +1032,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(host)}"), :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 +2137,9 @@ 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
+               block_on(agent_nodes, {:run_in_parallel => true}) do |host|
+                 on host, puppet_agent("-t #{waitforlock_flag(host)}"), :acceptable_exit_codes => [0,2]
+               end
              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.22'
       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")
@@ -2025,7 +2026,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs agent on agent hosts' do
       agents = [agent, agent]
-      expect(subject).to receive(:block_on).with(agents, :run_in_parallel => true)
+      expect(subject).to receive(:block_on).with(agents, :run_in_parallel => true).twice
       subject.install_agents_only_on(agents, opts)
     end
 
@@ -2035,13 +2036,6 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject).to receive(:stop_agent_on).with(agents, :run_in_parallel => true)
       subject.install_agents_only_on(agents, opts)
     end
-
-    it 'runs puppet on agent hosts' do
-      agents = [agent, agent]
-      expect(subject).to receive(:on).with(agents, proc {
-        |cmd| cmd.command == "puppet agent"}, hash_including(:run_in_parallel => true)).once
-      subject.install_agents_only_on(agents, opts)
-    end
   end
 
   describe 'do_higgs_install' do

metadata

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