beaker-pe 1.40.6 → 1.40.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf4454eb72e4e157d8744b59bea5e83d6513797
-  data.tar.gz: f0077deaf7ecd87f425c2a387ce7501e4fae9ce5
+  metadata.gz: 13b9a267af89667c3168a4aa6a267cf2ea954ef9
+  data.tar.gz: 242ee943235059d01652b11d142c89b5d31df6dd
 SHA512:
-  metadata.gz: f311516f1bac907bef3cc6670c5aa1ae41bbe1d607d85fb1f123da10f595da5473031d8edca206a917fe29bade42a309d353b22cfee6caba23e96ede51bd9d0b
-  data.tar.gz: ceea7a29a4ef52016d1625d692611aeca8a981763d8883bcadf105da6e712ee28382b789fb6bcc4e5094a7dcccc4666a9b0bf8ce4aeb7a8a1b544ad159340235
+  metadata.gz: a1bc4764587f3951b6dfb3b2080ad7b15c95140197fb43fa655485dedd00a04aeef4f305fb81a9978a9ab73cd4a6943eb2dffd7853d1d8bf6c888592e8831ebd
+  data.tar.gz: 114e4129d42b8b9aba12359507931426ba5f541b0aeb4d9e38cbe5781fb7016cd36c6de5d5d8c2c56c34854fe71b7b7738c2514b830e3404c17b5f5bb309e3e9

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

@@ -1371,10 +1371,31 @@ module Beaker
         #                    The host object must have the 'working_dir', 'dist' and 'pe_installer' field set correctly.
         # @api private
         def higgs_installer_cmd host
-          higgs_answer = use_meep?(host['pe_ver']) ? '1' : 'Y'
+          higgs_answer = determine_higgs_answer(host['pe_ver'])
           "cd #{host['working_dir']}/#{host['dist']} ; nohup ./#{host['pe_installer']} <<<#{higgs_answer} > #{host['higgs_file']} 2>&1 &"
         end
 
+        # Determines the answer to supply to the command line installer in order to load up Higgs
+        # @return [String]
+        #  One of, 'Y', '1', '2'
+        #     'Y'
+        #       Pre-meep install of Higgs (Before PE 2016.2.0)
+        #     '1'
+        #       meep before PE 2018.1.3 (PE 2016.2.0 -> PE 2018.1.2)
+        #     '2'
+        #       Any meep PE 2018.1.3 or greater
+        def determine_higgs_answer(pe_ver)
+          if(use_meep?(pe_ver))
+            if(version_is_less(pe_ver, '2018.1.3'))
+              return '1'
+            else
+              return '2'
+            end
+          else
+            return 'Y'
+          end
+        end
+
         #Perform a Puppet Enterprise Higgs install up until web browser interaction is required, runs on linux hosts only.
         # @param [Host] host The host to install higgs on
         # @param  [Hash{Symbol=>Symbol, String}] opts The options

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.40.6'
+        STRING = '1.40.7'
       end
 
     end

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

@@ -2469,6 +2469,18 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe 'determine_higgs_answer' do
+    it 'returns Y if the pe_ver is pre-meep' do
+      expect(subject.determine_higgs_answer('2016.1.0')).to eq('Y')
+    end
+    it 'returns 1 if the pe_ver is less then 2018.1.3' do
+      expect(subject.determine_higgs_answer('2018.1.0')).to eq('1')
+    end
+    it 'returns 2 if the pe_ver is greater then 2018.1.3' do
+      expect(subject.determine_higgs_answer('2018.2.0')).to eq('2')
+    end
+  end
+
   describe 'update_pe_conf' do
     let(:pe_version) { '2017.1.0' }
     let(:master) { hosts[0] }

metadata

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