beaker-pe 1.38.0 → 1.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e92eecfdcc213e61799677bec5ed8bd276066e
-  data.tar.gz: e90e286369a943c793b2dff3b4311ff777b0a252
+  metadata.gz: bc167d062d00e928c3edab27aba88917f54740c0
+  data.tar.gz: be559e84df01d94b0476d6cd8ffa016f8e9a553e
 SHA512:
-  metadata.gz: 5f6106081204c645a007bb513f5e8ead7fe4d163ba532e5c6f0ae5f5d5c04899dae7f38079af907e791bbece8d52ebca6afc8fa84e94cf741f80800de9f464ff
-  data.tar.gz: 73f71045099372b06f175d014a12b589be56ea93ef2370067daf577bd651232f67c877117e86306db405380b5ff1a6d2385b2b15c080a4c1f1a67302f1b8d292
+  metadata.gz: 4be7886aef369fad8961946989a0f62e8de2a27fce265d23067fcaa8226b06b0d6988611e3f8fca5ae4300e76a51f52e7fdd6ea6d560185ace4b2c6c65e26e1d
+  data.tar.gz: ad0d95afca16cb36b9d7c492d29d2430ce002d2298cac88d328d107f53542e9cf7359daed05117b4a6d8d777140d77cd0de0dcb7988c23f6532906d66d9982df

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

@@ -1424,10 +1424,7 @@ module Beaker
               begin
                 execute_installer_cmd(master, opts)
               rescue Beaker::Host::CommandFailure => e
-                installer_log_dir = '/var/log/puppetlabs/installer'
-                latest_installer_log_file = on(master, "ls -1t #{installer_log_dir} | head -n1").stdout.chomp
-                #Check the lastest install log to confirm the expected failure is there
-                unless on(master, "grep 'The operation could not be completed because RBACs database has not been initialized' #{installer_log_dir}/#{latest_installer_log_file}", :acceptable_exit_codes => [0,1]).exit_code == 0
+                unless is_expected_pe_postgres_failure?(master)
                   raise "Install on master failed in an unexpected manner"
                 end
               end
@@ -1464,6 +1461,23 @@ module Beaker
           end
         end
 
+        #Check the lastest install log to confirm the expected failure is there
+        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
+          allowed_errors = ["The operation could not be completed because RBACs database has not been initialized",
+            "Timeout waiting for the database pool to become ready"]
+
+          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)
+              return true
+            end
+          end
+
+          false
+        end
+
         # Grabs the pe file from a remote host to the machine running Beaker, then
         # scp's the file out to the host.
         #

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.38.0'
+        STRING = '1.39.0'
       end
 
     end

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

@@ -1164,6 +1164,47 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  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
+      @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)
+      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)
+      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)
+      expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(false)
+    end
+  end
+
   describe 'do_install_pe_with_pe_managed_external_postgres with an agent' do
     let(:mono_master) { make_host('mono_master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
     let(:pe_postgres) { make_host('pe_postgres', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :roles => ['pe_postgres', 'agent']) }
@@ -1210,14 +1251,7 @@ describe ClassMixedWithDSLInstallUtils do
       #installer command on master is called twice on install
       expect(subject).to receive(:execute_installer_cmd).with(mono_master, {}).and_raise(Beaker::Host::CommandFailure).once.ordered
 
-      #Error handling
-      @installer_log_file_name = Beaker::Result.new( {}, '' )
-      @installer_log_file_name.stdout = "installer_log_name"
-      exit_code_mock = Object.new
-      allow(exit_code_mock).to receive(:exit_code).and_return( 0 )
-      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(exit_code_mock)
-
+      allow(subject).to receive(:is_expected_pe_postgres_failure?).and_return(true)
       allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
       expect(subject).to receive(:execute_installer_cmd).with(mono_master, {}).once.ordered
       allow(subject).to receive(:on).with(mono_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).exactly(3).times
@@ -1241,14 +1275,7 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:setup_pe_conf).exactly(2).times
 
       expect(subject).to receive(:execute_installer_cmd).with(mono_master, {}).and_raise(Beaker::Host::CommandFailure).once.ordered
-
-      #Error handling
-      @installer_log_file_name = Beaker::Result.new( {}, '' )
-      @installer_log_file_name.stdout = "installer_log_name"
-      exit_code_mock = Object.new
-      allow(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(exit_code_mock)
+      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")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.38.0
+  version: 1.39.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec