beaker-pe 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGNiYmFhYjQxZjA3NWI3ZjY2OTQ1ZWQ2ZGY5YjE4NzU3MDY5MDNlNQ==
+    ZTFkZTk0ODM1OWJkODQyM2M0NDVkNTA2MWIxN2FlYjU5MWI3MjRjMg==
   data.tar.gz: !binary |-
-    ZDYwZDc5ZDM4MGRhYjlkMDdiYTdlOTcyOTI3NGJiN2M4NWM4YjcxZA==
+    NDNlMmY2MDBiZjMxNjE0NTUzZTI3YzBiZmJlNjA0OTRlYjAxMzQxYw==
 SHA512:
   metadata.gz: !binary |-
-    NzQ4ZDI4OGNhY2UwNTg3ZmZkZDRlMTJmZjUxNTI4MDUyYzRjOTAxZTZlODQx
-    NDBiOGZmMTI0MDU4M2NjYTcxY2M3Yzg4NWQ0MjVmNDhkNzFjYjY4OGY5OTcw
-    YTExOTZjMjlhNWEyOWY5NTZhYTQxZTFjODJhMjYwNDEwOWY5MDg=
+    YjcwOTkwYTE2ZTIxNzdmZWVmM2JkODM3MzhmMzlmYTIzZWEwMTNhMmYxMDAz
+    YTdkMmIzZTBmN2YyMTI1ZWJmMDkyYWQwN2NlMjQ0NTAyODZmMzEzODJkOTEz
+    YWVhN2YwNmYzNzRjNWY3OGE0OTI0YjNlZGJiMWQyYTg4MDliZDc=
   data.tar.gz: !binary |-
-    MDgwNzY5MzBmZmMxOWIzY2JhNDE1MTBhYjVkMzI4YTc3YjQxNWIwMWVkZjFl
-    ZTQyOTkxMzNmZWNjMDQzZGEyYTQxMWUzNWM3YzEyNDE3ZDU4NWFjZmI3YTY3
-    YjgxMjA0Y2U5MjZkMmI0ZWEwNTJiYTljYzA4YjQyOTI5NWI1ZTk=
+    MWIxN2ZmZTc2NDE3MTE5NWNmMTY2OWRhYTUyZjcxZTRhZjNiNjU1NDZjMjcw
+    OTlhYmMyNWRiOWY5NDc5YTUyYzgxMDFlM2MyOWU3MDNlYzgxZTNlMjhkNmMw
+    NGI2MTRlMjc2MDAzY2YwN2E1MDBlNzQzMTMzMDI3MjRlNjllMjE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 1 Jun, 2016 (e04b1f64)](#LATEST)
+* [LATEST - 15 Jun, 2016 (985fe231)](#LATEST)
+* [0.4.0 - 1 Jun, 2016 (f5ad1884)](#0.4.0)
 * [0.3.0 - 26 May, 2016 (0d6b6d4c)](#0.3.0)
 * [0.2.0 - 18 May, 2016 (a65f2083)](#0.2.0)
 * [0.1.2 - 4 Apr, 2016 (a6fd7bef)](#0.1.2)
@@ -8,7 +9,36 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 1 Jun, 2016 (e04b1f64)
+### <a name = "LATEST">LATEST - 15 Jun, 2016 (985fe231)
+
+* (GEM) update beaker-pe version to 0.5.0 (985fe231)
+
+* Merge pull request #11 from highb/cutover/pe-14555 (1b21288a)
+
+
+```
+Merge pull request #11 from highb/cutover/pe-14555
+
+(PE-14555) Always use MEEP for >= 2016.2.0
+```
+* (PE-14555) Always use MEEP for >= 2016.2.0 (de3a5050)
+
+
+```
+(PE-14555) Always use MEEP for >= 2016.2.0
+
+Prior to this commit pe-beaker would use `INSTALLER_TYPE` to
+specify whether to run a MEEP (new) or legacy install.
+This commit changes pe-beaker to always use MEEP if the PE
+version being installed is >= 2016.2.0, and legacy otherwise.
+
+No ENV parameters will be passed to specify which to use, as we
+are now relying on the installer itself to default to using MEEP
+by default in all 2016.2.0 builds going forward.
+```
+### <a name = "0.4.0">0.4.0 - 1 Jun, 2016 (f5ad1884)
+
+* (HISTORY) update beaker-pe history for gem release 0.4.0 (f5ad1884)
 
 * (GEM) update beaker-pe version to 0.4.0 (e04b1f64)
 

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

@@ -511,24 +511,17 @@ module Beaker
           end
         end
 
-        # True if version is greater than or equal to 2016.2.0 and the
-        # INSTALLER_TYPE environment variable is 'meep'.
-        #
-        # This will be switched to be true if >= 2016.2.0 and INSTALLER_TYPE !=
-        # 'legacy' once meep is default.
-        #
-        # And then to just >= 2016.2.0 for cutover.
+        # True if version is greater than or equal to MEEP_CUTOVER_VERSION (2016.2.0)
         def use_meep?(version)
-          !version_is_less(version, MEEP_CUTOVER_VERSION) && ENV['INSTALLER_TYPE'] != 'legacy'
+          !version_is_less(version, MEEP_CUTOVER_VERSION)
         end
 
         # Set installer options on the passed *host* according to current
-        # version and external INSTALLER_TYPE setting.
+        # version.
         #
         # Sets:
         #   * 'pe_installer_conf_file'
         #   * 'pe_installer_conf_setting'
-        #   * 'pe_installer_type'
         #
         # @param [Beaker::Host] host The host object to configure
         # @return [Beaker::Host] The same host object passed in
@@ -537,12 +530,10 @@ module Beaker
             conf_file = "#{host['working_dir']}/pe.conf"
             host['pe_installer_conf_file'] = conf_file
             host['pe_installer_conf_setting'] = "-c #{conf_file}"
-            host['pe_installer_type'] = 'meep'
           else
             conf_file = "#{host['working_dir']}/answers"
             host['pe_installer_conf_file'] = conf_file
             host['pe_installer_conf_setting'] = "-a #{conf_file}"
-            host['pe_installer_type'] = 'legacy'
           end
           host
         end
@@ -559,7 +550,7 @@ module Beaker
         # @param [Hash] opts The Beaker options hash
         # @return [Hash] a dup of the opts hash with additional settings for BeakerAnswers
         def setup_beaker_answers_opts(host, opts)
-          beaker_answers_opts = host['pe_installer_type'] == 'meep' ?
+          beaker_answers_opts = use_meep?(host['pe_ver']) ?
             { :format => :hiera } :
             { :format => :bash }
 
@@ -574,9 +565,8 @@ module Beaker
         # installation.
         #
         # Expects the host['pe_installer_conf_file'] to have been set, which is
-        # where the configuration will be written to, and expects
-        # host['pe_installer_type'] to have been set to either 'legacy' or
-        # 'meep'.
+        # where the configuration will be written to, and will run MEEP or legacy
+        # depending on host[:pe_ver]
         #
         # @param [Beaker::Host] host The host to create a configuration file on
         # @param [Array<Beaker::Host]> hosts All of the hosts to be configured
@@ -776,7 +766,7 @@ 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 = host['pe_installer_type'] == 'meep' ? '1' : 'Y'
+          higgs_answer = use_meep?(host['pe_ver']) ? '1' : 'Y'
           "cd #{host['working_dir']}/#{host['dist']} ; nohup ./#{host['pe_installer']} <<<#{higgs_answer} > #{host['higgs_file']} 2>&1 &"
         end
 

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.4.0'
+        STRING = '0.5.0'
       end
 
     end

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

@@ -292,14 +292,9 @@ describe ClassMixedWithDSLInstallUtils do
       let(:higgs_answer) { '1' }
 
       before(:each) do
-        ENV['INSTALLER_TYPE'] = 'meep'
         host['pe_ver'] = '2016.2.0'
       end
 
-      after(:each) do
-        ENV.delete('INSTALLER_TYPE')
-      end
-
       context 'the higgs_installer_cmd' do
         it 'submits correct command to invoke Higgs' do
           subject.prepare_host_installer_options(host)
@@ -321,31 +316,23 @@ describe ClassMixedWithDSLInstallUtils do
       {
         :pe_installer_conf_file => '/tmp/answers',
         :pe_installer_conf_setting => '-a /tmp/answers',
-        :pe_installer_type => 'legacy',
       }
     end
     let(:meep_settings) do
       {
         :pe_installer_conf_file => '/tmp/pe.conf',
         :pe_installer_conf_setting => '-c /tmp/pe.conf',
-        :pe_installer_type => 'meep',
       }
     end
-    let(:installer_type) { nil }
     let(:host) { unixhost }
 
     before(:each) do
-      ENV['INSTALLER_TYPE'] = installer_type
       host['pe_ver'] = pe_ver
       subject.prepare_host_installer_options(host)
     end
 
-    after(:each) do
-      ENV.delete('INSTALLER_TYPE')
-    end
-
     def slice_installer_options(host)
-      host.select { |k,v| [ :pe_installer_conf_file, :pe_installer_conf_setting, :pe_installer_type].include?(k) }
+      host.select { |k,v| [ :pe_installer_conf_file, :pe_installer_conf_setting].include?(k) }
     end
 
     context 'when version < 2016.2.0' do
@@ -354,57 +341,20 @@ describe ClassMixedWithDSLInstallUtils do
       it 'sets legacy settings' do
         expect(slice_installer_options(host)).to eq(legacy_settings)
       end
-
-      context 'and ENV["INSTALLER"]=="meep"' do
-        let(:installer_type) { 'meep' }
-
-        it 'still sets legacy settings' do
-          expect(slice_installer_options(host)).to eq(legacy_settings)
-        end
-      end
     end
 
     context 'when version >= 2016.2.0' do
       let (:pe_ver) { '2016.2.0' }
 
-      context 'and ENV["INSTALLER_TYPE"]=="legacy"' do
-        let(:installer_type) { 'legacy' }
-
-        it 'sets legacy settings' do
-          expect(slice_installer_options(host)).to eq(legacy_settings)
-        end
-
-        it 'test use_meep?' do
-          expect(subject.use_meep?('3.8.5')).to eq(false)
-          expect(subject.use_meep?('2016.1.2')).to eq(false)
-          expect(subject.use_meep?('2016.2.0')).to eq(false)
-          expect(subject.use_meep?('2016.2.0-rc1-gabcdef')).to eq(false)
-        end
+      it 'test use_meep?' do
+        expect(subject.use_meep?('3.8.5')).to eq(false)
+        expect(subject.use_meep?('2016.1.2')).to eq(false)
+        expect(subject.use_meep?('2016.2.0')).to eq(true)
+        expect(subject.use_meep?('2016.2.0-rc1-gabcdef')).to eq(true)
       end
 
-      context 'and ENV["INSTALLER_TYPE"]=="meep"' do
-        let(:installer_type) { 'meep' }
-
-        it 'sets meep settings' do
-          expect(slice_installer_options(host)).to eq(meep_settings)
-        end
-      end
-
-      context 'and ENV["INSTALLER_TYPE"] is not set' do
-        before(:each) do
-          ENV.delete('INSTALLER_TYPE')
-        end
-
-        it 'sets meep settings' do
-          expect(slice_installer_options(host)).to eq(meep_settings)
-        end
-
-        it 'test use_meep?' do
-          expect(subject.use_meep?('3.8.5')).to eq(false)
-          expect(subject.use_meep?('2016.1.2')).to eq(false)
-          expect(subject.use_meep?('2016.2.0')).to eq(true)
-          expect(subject.use_meep?('2016.2.0-rc1-gabcdef')).to eq(true)
-        end
+      it 'sets meep settings' do
+        expect(slice_installer_options(host)).to eq(meep_settings)
       end
     end
   end
@@ -412,9 +362,8 @@ describe ClassMixedWithDSLInstallUtils do
   describe 'generate_installer_conf_file_for' do
     let(:master) { hosts.first }
 
-    it 'generates a legacy answer file if host["pe_installer_type"]=="legacy"' do
+    it 'generates a legacy answer file if < 2016.2.0' do
       master['pe_installer_conf_file'] = '/tmp/answers'
-      master['pe_installer_type'] = 'legacy'
       expect(subject).to receive(:create_remote_file).with(
         master,
         '/tmp/answers',
@@ -423,9 +372,8 @@ describe ClassMixedWithDSLInstallUtils do
       subject.generate_installer_conf_file_for(master, hosts, opts)
     end
 
-    it 'generates a meep config file if host["pe_installer_type"]=="meep"' do
+    it 'generates a meep config file if >= 2016.2.0' do
       master['pe_installer_conf_file'] = '/tmp/pe.conf'
-      master['pe_installer_type'] = 'meep'
       master['pe_ver'] = '2016.2.0'
       expect(subject).to receive(:create_remote_file).with(
         master,
@@ -442,7 +390,6 @@ describe ClassMixedWithDSLInstallUtils do
 
     context 'for legacy installer' do
       it 'adds option for bash format' do
-        host['pe_installer_type'] = 'legacy'
         expect(subject.setup_beaker_answers_opts(host, opts)).to eq(
           opts.merge(
             :format => :bash,
@@ -454,13 +401,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     context 'for meep installer' do
       before(:each) do
-        ENV['INSTALLER_TYPE'] = 'meep'
         host['pe_ver'] = '2016.2.0'
-        host['pe_installer_type'] = 'meep'
-      end
-
-      after(:each) do
-        ENV.delete('INSTALLER_TYPE')
       end
 
       it 'adds option for hiera format' do
@@ -886,7 +827,7 @@ describe ClassMixedWithDSLInstallUtils do
         allow( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] )
       end
       #  We wait for puppetdb to restart 3 times; once before the first puppet run, and then during each puppet run
-      allow( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times 
+      allow( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times
       #run puppet agent now that installation is complete
       allow( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).twice
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec