beaker-pe 3.6.1 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd1d8c42972081bb9b5f9f49d4f1cefd90424a84594dfdf1c96a136fa48d7d8
-  data.tar.gz: eff2646196013b1cf2ad368e4a5f4ce3fe4c6d5534dcf5425f5024dc1b508b53
+  metadata.gz: 03bf3c005114d8ea4bc9e8a2f10b1d25afcd1e3919d09a0a079e925ef35b51ff
+  data.tar.gz: c5507077282d107fdab48081b9736fcfb9a9af8ca600faf316e76fc26ba16067
 SHA512:
-  metadata.gz: '069a53cb8696fb530fe31c90cb3820408285a56894bfa62c6677dd4ea89a9e183a74dc1f1771bebb14bd1ec43af32457427d6b712eb5a0587a14e9a251df0efe'
-  data.tar.gz: f3053f4e7d7a3a1aae929b40448e8c60357e814cd8bedc91a3d165d899932410575f11d02c3ca3f6a3ed65d7b95db32292278abcbb7a035ceca0012ac3a16958
+  metadata.gz: efb6f1688532acf22b13e6978d4b5cc65df15b2c1e781c886a701deb42206d0985d3bd1af74ddcda09377700777fb83c8278971ef567f682aee71478c278c918
+  data.tar.gz: c9a0843cf5ee0dffa774db34b254214ffc0df72bc54bda36afb4ce89650e6060f481729721f43f67bd2396b0700f61f54d92595114b9314c51205a47a5693708

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

@@ -825,8 +825,10 @@ NOASK
 
           install_agents_only_on(agents, opts)
 
+          # waitforlock in case install_agents_only_on triggers a puppet run on the
+          # master that is still in progress when we get here
           step "Run puppet a second time on the primary to populate services.conf (PE-19054)" do
-            on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
+            on(master, puppet_agent("-t #{waitforlock_flag(master)}".rstrip), :acceptable_exit_codes => [0,2])
           end
         end
 
@@ -2082,7 +2084,7 @@ EOM
                 execute_installer_cmd(master, opts)
               rescue Beaker::Host::CommandFailure => e
                 unless is_expected_pe_postgres_failure?(master)
-                  raise "Install on master failed in an unexpected manner"
+                  raise "Install on master failed in an unexpected manner: #{e.message}"
                 end
               end
             end
@@ -2102,9 +2104,11 @@ EOM
             stop_agent_on(pe_infrastructure, :run_in_parallel => true)
           end
 
+          # waitforlock in case stopping the agent run after stopping the agent service
+          # takes a little longer than usual
           step "First puppet run on infrastructure + postgres node" do
             [master, database, dashboard, pe_postgres].uniq.each do |host|
-              on host, 'puppet agent -t', :acceptable_exit_codes => [0,2]
+              on host, ["puppet agent -t", waitforlock_flag(host)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
             end
           end
 
@@ -2112,13 +2116,15 @@ EOM
             install_agents_only_on(non_infrastructure, opts)
 
             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(master)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
               run_puppet_on_non_infrastructure_nodes(non_infrastructure)
             end
 
           end
+          # waitforlock in case install_agents_only_on triggers a puppet run on the
+          # master that is still in progress when we get here
           step "Run puppet a second time on the primary to populate services.conf (PE-19054)" do
-            on master, 'puppet agent -t', :acceptable_exit_codes => [0,2]
+            on master, ["puppet agent -t", waitforlock_flag(master)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
           end
         end
 
@@ -2126,14 +2132,23 @@ EOM
         def is_expected_pe_postgres_failure?(host)
           installer_log_dir = '/var/log/puppetlabs/installer'
           latest_installer_log_file = on(host, "ls -1t #{installer_log_dir} | head -n1").stdout.chomp
-          # As of PE Irving (PE 2018.1.x), these are the only two expected errors
+          # The initial master install pass runs before pe-postgres is fully
+          # up, so it's expected to fail: the RBAC/console database isn't
+          # reachable yet, and depending on timing any core PE service
+          # (pe-console-services, pe-puppetdb, pe-puppetserver, etc.) may
+          # not (re)start before this pass' own timeouts trip. All of these
+          # are recoverable by the later "Install/Upgrade postgres service"
+          # and "Finish install/upgrade" steps, so they shouldn't fail the
+          # test. Match the service-startup failure class generically
+          # rather than enumerating individual services/ports here.
           allowed_errors = ["The operation could not be completed because RBACs database has not been initialized",
             "Timeout waiting for the database pool to become ready",
-            "Systemd restart for pe-console-services failed",
-            "Execution of.*service pe-console-services.*: Reload timed out after 120 seconds"]
+            "Systemd (start|restart) for pe-\\S+ failed",
+            "Execution of.*service pe-console-services.*: Reload timed out after 120 seconds",
+            "Connection refused"]
 
           allowed_errors.each do |error|
-            if(on(host, "grep '#{error}' #{installer_log_dir}/#{latest_installer_log_file}", :acceptable_exit_codes => [0,1]).exit_code == 0)
+            if(on(host, "grep -E '#{error}' #{installer_log_dir}/#{latest_installer_log_file}", :acceptable_exit_codes => [0,1]).exit_code == 0)
               return true
             end
           end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.6.1'
+        STRING = '3.6.3'
       end
 
     end

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

@@ -1305,76 +1305,61 @@ describe ClassMixedWithDSLInstallUtils do
   describe 'is_expected_pe_postgres_failure? method' do
     let(:mono_master) { make_host('mono_master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
 
-    it 'will return true if it is the RBAC database string matcher' do
+    let(:zero_exit_code_mock) do
+      mock = Object.new
+      allow(mock).to receive(:exit_code).and_return(0)
+      mock
+    end
+    let(:one_exit_code_mock) do
+      mock = Object.new
+      allow(mock).to receive(:exit_code).and_return(1)
+      mock
+    end
+
+    def stub_installer_log_greps(all_but: nil)
       @installer_log_file_name = Beaker::Result.new( {}, '' )
       @installer_log_file_name.stdout = "installer_log_name"
-      zero_exit_code_mock = Object.new
-      allow(zero_exit_code_mock).to receive(:exit_code).and_return(0)
-      one_exit_code_mock = Object.new
-      allow(one_exit_code_mock).to receive(:exit_code).and_return(1)
       allow(subject).to receive(:on).with(mono_master, "ls -1t /var/log/puppetlabs/installer | head -n1").and_return(@installer_log_file_name)
-      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(zero_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Timeout waiting for the database pool to become ready' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Systemd restart for pe-console-services failed' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Execution of.*service pe-console-services.*: Reload timed out after 120 seconds' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
+
+      patterns = ["The operation could not be completed because RBACs database has not been initialized",
+        "Timeout waiting for the database pool to become ready",
+        "Systemd (start|restart) for pe-\\S+ failed",
+        "Execution of.*service pe-console-services.*: Reload timed out after 120 seconds",
+        "Connection refused"]
+
+      patterns.each do |pattern|
+        result = (pattern == all_but) ? zero_exit_code_mock : one_exit_code_mock
+        allow(subject).to receive(:on).with(mono_master, "grep -E '#{pattern}' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(result)
+      end
+    end
+
+    it 'will return true if it is the RBAC database string matcher' do
+      stub_installer_log_greps(all_but: "The operation could not be completed because RBACs database has not been initialized")
       expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(true)
     end
 
     it 'will return true if it is the database pool timeout string matcher' do
-      @installer_log_file_name = Beaker::Result.new( {}, '' )
-      @installer_log_file_name.stdout = "installer_log_name"
-      zero_exit_code_mock = Object.new
-      allow(zero_exit_code_mock).to receive(:exit_code).and_return(0)
-      one_exit_code_mock = Object.new
-      allow(one_exit_code_mock).to receive(:exit_code).and_return(1)
-      allow(subject).to receive(:on).with(mono_master, "ls -1t /var/log/puppetlabs/installer | head -n1").and_return(@installer_log_file_name)
-      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Timeout waiting for the database pool to become ready' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(zero_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Systemd restart for pe-console-services failed' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Execution of.*service pe-console-services.*: Reload timed out after 120 seconds' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
+      stub_installer_log_greps(all_but: "Timeout waiting for the database pool to become ready")
       expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(true)
     end
 
-    it 'will return true if it is the systemd restart of cosnole-services failure matcher' do
-      @installer_log_file_name = Beaker::Result.new( {}, '' )
-      @installer_log_file_name.stdout = "installer_log_name"
-      zero_exit_code_mock = Object.new
-      allow(zero_exit_code_mock).to receive(:exit_code).and_return(0)
-      one_exit_code_mock = Object.new
-      allow(one_exit_code_mock).to receive(:exit_code).and_return(1)
-      allow(subject).to receive(:on).with(mono_master, "ls -1t /var/log/puppetlabs/installer | head -n1").and_return(@installer_log_file_name)
-      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Timeout waiting for the database pool to become ready' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Systemd restart for pe-console-services failed' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(zero_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Execution of.*service pe-console-services.*: Reload timed out after 120 seconds' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
+    it 'will return true if it is the systemd start/restart of a pe-* service failure matcher (e.g. pe-console-services, pe-puppetdb, pe-puppetserver)' do
+      stub_installer_log_greps(all_but: "Systemd (start|restart) for pe-\\S+ failed")
       expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(true)
     end
 
     it 'will return true if it is the console-services reload timeout string matcher' do
-      @installer_log_file_name = Beaker::Result.new( {}, '' )
-      @installer_log_file_name.stdout = "installer_log_name"
-      zero_exit_code_mock = Object.new
-      allow(zero_exit_code_mock).to receive(:exit_code).and_return(0)
-      one_exit_code_mock = Object.new
-      allow(one_exit_code_mock).to receive(:exit_code).and_return(1)
-      allow(subject).to receive(:on).with(mono_master, "ls -1t /var/log/puppetlabs/installer | head -n1").and_return(@installer_log_file_name)
-      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Timeout waiting for the database pool to become ready' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Systemd restart for pe-console-services failed' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Execution of.*service pe-console-services.*: Reload timed out after 120 seconds' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(zero_exit_code_mock)
+      stub_installer_log_greps(all_but: "Execution of.*service pe-console-services.*: Reload timed out after 120 seconds")
+      expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(true)
+    end
+
+    it 'will return true if it is the connection refused matcher' do
+      stub_installer_log_greps(all_but: "Connection refused")
       expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(true)
     end
 
     it 'will return false if no error messages are matched' do
-      @installer_log_file_name = Beaker::Result.new( {}, '' )
-      @installer_log_file_name.stdout = "installer_log_name"
-      one_exit_code_mock = Object.new
-      allow(one_exit_code_mock).to receive(:exit_code).and_return(1)
-      allow(subject).to receive(:on).with(mono_master, "ls -1t /var/log/puppetlabs/installer | head -n1").and_return(@installer_log_file_name)
-      allow(subject).to receive(:on).with(mono_master, "grep 'The operation could not be completed because RBACs database has not been initialized' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Timeout waiting for the database pool to become ready' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Systemd restart for pe-console-services failed' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
-      allow(subject).to receive(:on).with(mono_master, "grep 'Execution of.*service pe-console-services.*: Reload timed out after 120 seconds' /var/log/puppetlabs/installer/installer_log_name", :acceptable_exit_codes=>[0, 1]).and_return(one_exit_code_mock)
+      stub_installer_log_greps
       expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(false)
     end
   end
@@ -1458,7 +1443,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject).to receive(:execute_installer_cmd).with(mono_master, {}).and_raise(Beaker::Host::CommandFailure).once.ordered
       allow(subject).to receive(:is_expected_pe_postgres_failure?).and_return(false)
 
-      expect{ subject.do_install_pe_with_pe_managed_external_postgres([mono_master, pe_postgres, agent], {}) }.to raise_error(RuntimeError, "Install on master failed in an unexpected manner")
+      expect{ subject.do_install_pe_with_pe_managed_external_postgres([mono_master, pe_postgres, agent], {}) }.to raise_error(RuntimeError, /\AInstall on master failed in an unexpected manner: /)
     end
 
     it 'will do a monolithic upgrade of PE with an external postgres that is managed by PE' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.3
 platform: ruby
 authors:
 - Puppetlabs
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Beaker PE DSL Helpers!
 test_files: []