beaker-pe 1.30.0 → 1.31.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjViMjE3NDc2NGE0MThhNjc0OGZkODg5ODI1MzU3M2U2ZmNiMzgwNg==
+    MjU5OWMzNmI1ODNjYzFhY2I4ZGNiMGYzZjVmZTc0OTEzYWEyNTNkZg==
   data.tar.gz: !binary |-
-    OTE3ZmY4YjgyNDQ2ZDRmNGI0ZTQ1OWRkZWVkNWE3Y2E5MTE5NjJjNA==
+    MDc4NmNiZmM4NzUwNGZjM2JmZjFkYWY1ODQxMTc0YzFjMDJkNTljYg==
 SHA512:
   metadata.gz: !binary |-
-    NzhhZGQ3ZjUwZWRhMzkzNTg5ZDcxZDQwNmE5MWM3ZWFmZjU5MzhmOTA5Mzdl
-    NmRlNjQxMDY4ZmQwOTVkMzRiMTJhNjgxMTA2ODZlODE2NzMzNWVkODg5Zjgy
-    NzU5ZDM4NjNmMjBlNzNkN2QxMDE5YWZlN2ZhZWE2Y2Y1NWQ4NjA=
+    YjhlNWEyMWUyYTI0NjE5MGViNjQwYjNmNjU5N2QzODhiM2ZhZmRhZTEyNGE1
+    ZmQ3NjFhNmU0NTFjZjZiYjVmNjY4NDEwZTRhMDFmYWEwYmE1OTdmZDYzYjRm
+    MGQ5YTJmZmU2ODA2MjA1NmVmMzk0OWQzNzMyODBkMDdhMzNjZGM=
   data.tar.gz: !binary |-
-    MGVmOGQ0NDBiNTEyMjc2MjA4MGI0Zjk0MDM3YWY3MWVjZmFlMmZjM2M2NmFh
-    YTdiY2RiMTYzYTc4YmYyODJiZTkxYmFiZGE5MjQ3ZTY3MGEzNzdmZGRiMzI3
-    NWQ2NGVhZWQwYjE4ZTY2NjIyNzQ3ZDdiMjMwY2QxZGY2ZTZhMmM=
+    MjFiZjA3ODI0NWZhM2ZlN2YyZTIyNTBiZTUzOTIzNWZjZTFhMjFkNTlhYzgy
+    NWVjOTM3ZmRlMGVmYmIyOWQwMzVmNTM4ZTI5NzI5MzQ3ZmJhMWUyOWQ0Mzc2
+    ZDM3N2JkZjE2ZGM5NzZmYTAyZDIxZTI2YWFmOWIzMmUyZmZiN2U=

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

@@ -1342,8 +1342,10 @@ module Beaker
               begin
                 execute_installer_cmd(master, opts)
               rescue Beaker::Host::CommandFailure => e
-                #The way the master fails to install includes this specific line as of PE 2018.1.x.
-                unless e.message =~ /The operation could not be completed because RBACs database has not been initialized/
+                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}")
                   raise "Install on master failed in an unexpected manner"
                 end
               end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.30.0'
+        STRING = '1.31.0'
       end
 
     end

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

@@ -1168,6 +1168,59 @@ describe ClassMixedWithDSLInstallUtils do
       expect{ subject.do_install_pe_with_pe_managed_external_postgres([mono_master, pe_postgres, agent], {}) }.not_to raise_error
     end
 
+    it 'will rescue out of the error and complete the installation' do
+      allow(subject).to receive(:fetch_pe).with([mono_master, pe_postgres], {}).and_return(true)
+      allow(subject).to receive(:master).and_return(mono_master)
+      allow(subject).to receive(:database).and_return(mono_master)
+      allow(subject).to receive(:dashboard).and_return(mono_master)
+      allow(subject).to receive(:pe_postgres).and_return(pe_postgres)
+
+      allow(subject).to receive(:original_pe_ver).and_return('2017.2')
+      allow(subject).to receive(:prepare_host_installer_options).exactly(2).times
+      allow(subject).to receive(:setup_pe_conf).exactly(2).times
+
+      #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"
+      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").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
+      allow(subject).to receive(:on).with(pe_postgres, "puppet agent -t", :acceptable_exit_codes=> [0, 2]).once
+
+      allow(subject).to receive(:install_agents_only_on).with([agent], {})
+      allow(subject).to receive(:run_puppet_on_non_infrastructure_nodes).with([agent])
+
+      expect{ subject.do_install_pe_with_pe_managed_external_postgres([mono_master, pe_postgres, agent], {}) }.not_to raise_error
+    end
+
+    it 'will fail install as expected if rescue does not match error message' do
+      allow(subject).to receive(:fetch_pe).with([mono_master, pe_postgres], {}).and_return(true)
+      allow(subject).to receive(:master).and_return(mono_master)
+      allow(subject).to receive(:database).and_return(mono_master)
+      allow(subject).to receive(:dashboard).and_return(mono_master)
+      allow(subject).to receive(:pe_postgres).and_return(pe_postgres)
+
+      allow(subject).to receive(:original_pe_ver).and_return('2017.2')
+      allow(subject).to receive(:prepare_host_installer_options).exactly(2).times
+      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"
+      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").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
+
     it 'will do a monolithic upgrade of PE with an external postgres that is managed by PE' do
       allow(subject).to receive(:fetch_pe).with([mono_master, pe_postgres], {}).and_return(true)
       allow(subject).to receive(:master).and_return(mono_master)

metadata

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