beaker-pe 1.40.1 → 1.40.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d2f3a830172fb8639723a327bbb42f4b2653c2c
-  data.tar.gz: 94c9fce23f9dc3c23a25e0c8f9b868247d6024ad
+  metadata.gz: 9ce3b0cc778156127d97c43444bae44ec5a62e2b
+  data.tar.gz: ba1a70b26ac998dbc015ea94dab32643a52ca111
 SHA512:
-  metadata.gz: 726297dc8a378882eecbb8e6432e087770e5cc5c4b52d3dbc911e57c72959e9df464c26c17ebad402501596c4c52d587f16d0da62dde56cf908e37c092f9ddb7
-  data.tar.gz: 21ea61bb695784c515e407ebc74f7d4fa971e74a6b1f090a1122a8733ac7901b193c1622e91a94624d6dbce7c90127811dd7b831fcff9ce93539f3e46f03699c
+  metadata.gz: ac36a389316076d94eb6d0c91bd07d525b6d83e61dfadeb4a003fe73b94ed351dd9925677bd985b940b4ae491ff50662aebd2e3c24edd2c7e112a69ffc39994a
+  data.tar.gz: ccacfd0acb784cfb52746f5d0658aba26d3302e23eed5008cdbb212f0b2bfc3b14f44810e510b4a9adea79c1cdbdd9c8d007873b75040d7b60abb9e4de564fb5

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

@@ -1515,7 +1515,9 @@ module Beaker
           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"]
+            "Timeout waiting for the database pool to become ready",
+            "Systemd restart for pe-console-services failed",
+            "Reloading pe-console-services: Reload timed out after 120 seconds"]
 
           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)

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.40.1'
+        STRING = '1.40.2'
       end
 
     end

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

@@ -1235,6 +1235,8 @@ describe ClassMixedWithDSLInstallUtils do
       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 'Reloading 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)
       expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(true)
     end
 
@@ -1248,6 +1250,38 @@ describe ClassMixedWithDSLInstallUtils do
       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 'Reloading 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)
+      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 'Reloading 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)
+      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 'Reloading 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)
       expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(true)
     end
 
@@ -1259,6 +1293,8 @@ describe ClassMixedWithDSLInstallUtils do
       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 'Reloading 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)
       expect(subject.is_expected_pe_postgres_failure?(mono_master)). to eq(false)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.40.1
+  version: 1.40.2
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec