beaker-pe 2.11.21 → 2.11.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527fe6d6360dfb51c8f1e2dbd9f032802b8b41b27f0c46e4ac80e96df585014e
-  data.tar.gz: 7c6a69a2b023551ca1332b2319583fba658536194d228fa29478bf33f906b58c
+  metadata.gz: 8becd49a23057ad0bd43368413ef30c2902a24904a9049e55ae5a70005f38ba3
+  data.tar.gz: 9f8d19e850b9a64f007e7096fd733159b7b2e74a064572823cf6efcf501312f1
 SHA512:
-  metadata.gz: 1626c5e8d6cabd70eadef2c69262f1c3af5364092abe76f395198726c6aa98c86a273308edb2dbd400b3e77647a75f567bb7551d1c7f7e20cf4ed9e1cee958ed
-  data.tar.gz: a9f9764d8fdeaf123d498f90c63b571d7f759ce3b776022640a24dd6e91eefe84d18232ee992ea7cc074694a9c984791e4683f0497b453d34d5d9842fe989611
+  metadata.gz: b286e0c93899aa70cfd61d6729f46c6db9042c407f7c4ee64618cb251738677af21d1f499a746b62eb18d15afd83eebab7dc9e6b9a7b6184cbf2fff3fb53c539
+  data.tar.gz: a6bb05de8a00d72ef78887b24eea5db7b5835329a2b0d36ded5f2a492890e62d61b0da143377cc5c477561f8db8b30c12fcaba1ad9a206633da971a9aa98a75e

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

@@ -144,8 +144,17 @@ module Beaker
         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'
+        #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
@@ -731,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_flag}"), :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)
@@ -814,6 +823,8 @@ module Beaker
               # The next two lines clear the rest of the internal puppet lan
               on host, "iptables -A OUTPUT -p tcp -d 10.16.0.0/16 -j ACCEPT"
               on host, "iptables -A OUTPUT -p tcp -d 10.32.0.0/16 -j ACCEPT"
+              # And for GCP scratchpad hosts
+              on host, "iptables -A OUTPUT -p tcp -d 10.253.0.0/16 -j ACCEPT"
               # This allows udp on a port bundler requires
               on host, 'iptables -A OUTPUT -p udp -m udp --dport 53 -j ACCEPT'
               # Next two lines allow host to access itself via localhost or 127.0.0.1
@@ -982,7 +993,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_flag}"), :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,
@@ -1023,7 +1034,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_flag}"), :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
@@ -2128,7 +2139,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_flag}"), :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.21'
+        STRING = '2.11.23'
       end
 
     end

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

@@ -2026,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
 
@@ -2036,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.21
+  version: 2.11.23
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec