beaker-pe 1.29.0 → 1.30.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjJjMDhkODRmN2EzN2ZjMmQyMjViMzYyNjBmNTkxNjM2N2FiZTc3Zg==
+    YjViMjE3NDc2NGE0MThhNjc0OGZkODg5ODI1MzU3M2U2ZmNiMzgwNg==
   data.tar.gz: !binary |-
-    MDYzNjdhN2QzZTkzZWVjMWY4YTkzM2NjZDY1NmVkZWZkZTRkZDBhNw==
+    OTE3ZmY4YjgyNDQ2ZDRmNGI0ZTQ1OWRkZWVkNWE3Y2E5MTE5NjJjNA==
 SHA512:
   metadata.gz: !binary |-
-    MmE5YWJlMmNiZjg5YTMzNTY5MGIwYjUzZWE5MDhmNDE2M2Q3YTFiMGE3MzQ2
-    ZGQwNWMwMGRiZDA3NWNhMzcwNWJjNGM0NTg1Y2JkM2Y2YTViYzUxMDA1ZDky
-    NGNlYjU0MTZlZTgyY2UzYjBiNmRkMDRmMzcwNGFiY2ZiY2FlNWU=
+    NzhhZGQ3ZjUwZWRhMzkzNTg5ZDcxZDQwNmE5MWM3ZWFmZjU5MzhmOTA5Mzdl
+    NmRlNjQxMDY4ZmQwOTVkMzRiMTJhNjgxMTA2ODZlODE2NzMzNWVkODg5Zjgy
+    NzU5ZDM4NjNmMjBlNzNkN2QxMDE5YWZlN2ZhZWE2Y2Y1NWQ4NjA=
   data.tar.gz: !binary |-
-    ZmEyMTcxZmM0NDVmZDc4YTIwZTRhN2RlM2ViZjNhMWNhMWVmMjJiNjVlZmU3
-    ZDllNDk4M2UyZmFiZDY0OTdmMzRjM2FhYTdjNGI2YjNlYmZlMTk1YWJkNjlm
-    ZjMwOGMyODgyNTkwMWVkOTA3YjNlMTdiNWRjNTk4MGEyZjcyMmQ=
+    MGVmOGQ0NDBiNTEyMjc2MjA4MGI0Zjk0MDM3YWY3MWVjZmFlMmZjM2M2NmFh
+    YTdiY2RiMTYzYTc4YmYyODJiZTkxYmFiZGE5MjQ3ZTY3MGEzNzdmZGRiMzI3
+    NWQ2NGVhZWQwYjE4ZTY2NjIyNzQ3ZDdiMjMwY2QxZGY2ZTZhMmM=

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

@@ -524,7 +524,7 @@ module Beaker
           # Do a generic install if this is masterless, not all the same PE version, an upgrade, or earlier than 2016.4
           return :generic if opts[:masterless]
           return :generic if hosts.map {|host| host['pe_ver']}.uniq.length > 1
-          return :generic if opts[:type] == :upgrade
+          return :generic if (opts[:type] == :upgrade) && (hosts.none? {|host| host['roles'].include?('pe_postgres')})
           return :generic if version_is_less(opts[:pe_ver] || hosts.first['pe_ver'], '2016.4')
           #PE-20610 Do a generic install for old versions on windows that needs msi install because of PE-18351
           return :generic if hosts.any? {|host| host['platform'] =~ /windows/ && install_via_msi?(host)}

data/lib/beaker-pe/version.rb

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

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

@@ -1102,6 +1102,11 @@ describe ClassMixedWithDSLInstallUtils do
       expect(subject.determine_install_type(hosts, {:type => :upgrade})).to eq(:generic)
     end
 
+    it 'identifies an upgrade with postgres as pe_managed_postgres' do
+      hosts = [master, puppetdb, console, pe_postgres]
+      expect(subject.determine_install_type(hosts, {:type => :upgrade})).to eq(:pe_managed_postgres)
+    end
+
     it 'identifies a legacy PE version as generic' do
       old_monolithic = make_host('monolithic', :pe_ver => '3.8', :roles => [ 'master', 'database', 'dashboard' ])
       old_agent = make_host('agent', :pe_ver => '3.8', :roles => ['frictionless'])

metadata

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