beaker-pe 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDZkZGU0MTNmZTVjNjQ5NGM3YTk5OGFhNTNhM2IyMDFjYmQ3MmEyNg==
+    Yzg3NzgwODgwMmQ4ZTM5YTgxZWUxZjM0MGJhOTViZTA2NjBkYmYyYw==
   data.tar.gz: !binary |-
-    ODE5N2ZmYTdiYzkwOGM2MTIzY2Q0MjIwMGJlNGQ5MjIxYTk5YzEzMQ==
+    NDlhMTNiZDZjYzZhNGQ5NDEwNzE1ODYyMmFiZjg4M2ViZDZmYjc1OA==
 SHA512:
   metadata.gz: !binary |-
-    ZjZhMjJjZWI4ZTE4ZmRhYjExZjNmODdmM2Q5YzAzYTZmZGE5ZWQzMjM4ZTA3
-    NzNiMGQwYzZhZGRiZjc4ZjViMWViYTI3NWMwZmJjOTA5ZTlkMTIyZjVkMDIy
-    ZDA3NzUzMzkxZDE3NGYxMGI0ZWRhNDM1OWNhOTFiZjg2Y2UxYTA=
+    ZWM3YWJlNDlmMzY0YzM0MTYzZmY3ZGJiN2E0ZmMwMmY2YjQ1MTg3MjAyNWNj
+    NjUzNmMwMTQwZWYzYmQ0ZTA1OTg5ZjIzY2VlYTQ5YTkxM2M3YzAyNzdmMTFk
+    MzRjMDgyNDgzOWY5MTVlODZkMmFjMzNjYWZjZmUyMzAzMzZlZDE=
   data.tar.gz: !binary |-
-    NWI4NWFmYzA1YTdiMmQyNjIwNzY0ZjA0N2UwOTAzZGQxNjBhODFlZWI2OTFk
-    Y2I5MzY2ZWE3NDc3MTYzZTY2M2M4MGY4YzVlYjg4NmU5M2RjMzNjOTRjYTY2
-    M2UzNTE0MmM3MzdiY2I1OGI4OWQ4MjdjZTgyMGI1ZDdmMDg0YTI=
+    NWFjMDEzODdlNjU3ZGJmMmQwZmZkOTY2NTBiYmM2MjE5ODFjNTM1NDcwMTcz
+    M2QxY2YxNDRlMzc5OGMyOGYzODI2MjljNTczOGNlN2NiNDY1NGEwMGNmYjY0
+    ZTcxYWQzYWYxMGQ1N2Q0NGY1YzExM2U5OWUzZTNhMjlkODg4Nzc=

data/HISTORY.md

@@ -1,12 +1,174 @@
 # default - History
 ## Tags
-* [LATEST - 18 May, 2016 (d9a052a4)](#LATEST)
+* [LATEST - 26 May, 2016 (d58ed99e)](#LATEST)
+* [0.2.0 - 18 May, 2016 (a65f2083)](#0.2.0)
 * [0.1.2 - 4 Apr, 2016 (a6fd7bef)](#0.1.2)
 * [0.1.1 - 4 Apr, 2016 (8203d928)](#0.1.1)
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 18 May, 2016 (d9a052a4)
+### <a name = "LATEST">LATEST - 26 May, 2016 (d58ed99e)
+
+* (GEM) update beaker-pe version to 0.3.0 (d58ed99e)
+
+* Merge pull request #5 from jpartlow/issue/master/pe-14271-wire-for-meep (55aa098f)
+
+
+```
+Merge pull request #5 from jpartlow/issue/master/pe-14271-wire-for-meep
+
+(PE-14271) Wire beaker-pe for meep
+```
+* (maint) Add some logging context for sign and agent shutdown (398882f4)
+
+
+```
+(maint) Add some logging context for sign and agent shutdown
+
+...steps.
+```
+* (PE-14271) Do not try to sign certificate for meep core hosts (e485c423)
+
+
+```
+(PE-14271) Do not try to sign certificate for meep core hosts
+
+Certificate is generated by meep.  Step is redundant and produces failed
+puppet agent run and puppet cert sign in log.
+```
+* (PE-15259) Inform BeakerAnswers if we need legacy database defaults (7ef0347d)
+
+
+```
+(PE-15259) Inform BeakerAnswers if we need legacy database defaults
+
+Based on this setting, BeakerAnswers can provide legacy bash default
+values for database user parameters in the meep hiera config.  This is
+necessary if we are upgrading from an older pe that beaker just
+installed using the legacy script/answer defaults.
+
+Also logs the actual answers/pe.conf file that was generated so we can
+see what is going on.
+```
+* (maint) Remove unused variables from spec (61134529)
+
+
+```
+(maint) Remove unused variables from spec
+
+Marked by static analysis; specs continue to pass after removal.
+```
+* (PE-14271) Have mock hosts return a hostname (53e90212)
+
+
+```
+(PE-14271) Have mock hosts return a hostname
+
+Because BeakerAnswers sets hiera host parameters from Host#hostname, so
+the method needs to exist in our mocks.
+```
+* (maint) Make the previous_pe_ver available on upgrade (0f72aaab)
+
+
+```
+(maint) Make the previous_pe_ver available on upgrade
+
+Sometimes during PE upgrades we need to be able to determine what
+version we upgraded from, to know what behavior we expect from the
+upgrade.  Prior to this change, that could only be determined by probing
+into the original host.cfg yaml. This patch just sets it explicitly in
+each host prior to overwriting the pe_ver with pe_upgrade_ver.
+```
+* (PE-14271) Adjust higgs commands to provide correct answer (f7cc8d9a)
+
+
+```
+(PE-14271) Adjust higgs commands to provide correct answer
+
+...for both legacy and meep installers.  The former prompts to continue
+expecting 'Y' and the later prompts with options where '1' is intended
+to kick off Higgs.
+
+Also added spec coverage for these methods.
+```
+* (PE-14271) Adjust BeakerAnswers call for meep (6bc392ff)
+
+
+```
+(PE-14271) Adjust BeakerAnswers call for meep
+
+Based on changes pending in puppetlabs/beaker-answers#16, change the
+generate_installer_conf_file_for() method to submit the expected :format
+option temporarily.  This will go away when we cutover to meep and no
+longer have to have both installer scripts operational in the same
+build.
+
+Fleshes out the specs that verify the method returns expected answer or
+pe.conf data from BeakerAnswers, as written out via scp.
+```
+* (PE-14271) Prepare host installer options based on version/env (616612a6)
+
+
+```
+(PE-14271) Prepare host installer options based on version/env
+
+The addition of a use_meep? query allows setting host options for either
+legacy or meep installer.  This enables installer_cmd to invoke the
+correct installer.
+```
+* (maint) Remove remaining version_is_less mocks (7ea8fbcf)
+
+
+```
+(maint) Remove remaining version_is_less mocks
+
+For consistency, removed the rest of the version_is_less mocks.
+
+In the three cases where this had an impact on the specs, replaced
+them with a concrete version setting on the test host object.
+```
+* (maint) Stop mocking version_is_less in do_install tests (d3e09cc1)
+
+
+```
+(maint) Stop mocking version_is_less in do_install tests
+
+Each change to do_install and supporting methods involving a
+version_is_less call was requiring additional mocking simulating
+version_is_less's behavior.  This is unnecessary given that hosts are
+being set with a version, and actually masks behavior of the class.
+Removing these specifically because it was causing churn when
+introducing meep functionality.
+```
+* (PE-14271) Extract installer configuration methods (3071c5e9)
+
+
+```
+(PE-14271) Extract installer configuration methods
+
+...from the existing code to generate answers and expand it to
+generalize the installer settings and configuration file.  Passes
+existing specs.  Will be further specialized to handle legacy/meep
+cases.
+```
+* (PE-14934) Fix specs to cover changes from PE-14934 (b22c3790)
+
+
+```
+(PE-14934) Fix specs to cover changes from PE-14934
+
+Introduced chagnes to the do_install method, but specs were failing
+because of the tight coupling between expectations and counts of command
+execution.
+
+The need to initialize metadata comes from the fact that the previous
+PR #3 added step() calls, which reference the TestCase metadata attr.
+Since we aren't using an actual TestCase instance, this had to be
+initalized separately.
+```
+### <a name = "0.2.0">0.2.0 - 18 May, 2016 (a65f2083)
+
+* (HISTORY) update beaker-pe history for gem release 0.2.0 (a65f2083)
 
 * (GEM) update beaker-pe version to 0.2.0 (d9a052a4)
 

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

@@ -22,6 +22,9 @@ module Beaker
         include PuppetUtils
         include WindowsUtils
 
+        # Version of PE when we switched from legacy installer to MEEP.
+        MEEP_CUTOVER_VERSION = '2016.2.0'
+
         # @!macro [new] common_opts
         #   @param [Hash{Symbol=>String}] opts Options to alter execution.
         #   @option opts [Boolean] :silent (false) Do not produce log output
@@ -106,7 +109,7 @@ module Beaker
             host.install_from_file("puppet-enterprise-#{version}-#{host['platform']}.swix")
           else
             pe_debug = host[:pe_debug] || opts[:pe_debug]  ? ' -D' : ''
-            "cd #{host['working_dir']}/#{host['dist']} && ./#{host['pe_installer']}#{pe_debug} -a #{host['working_dir']}/answers"
+            "cd #{host['working_dir']}/#{host['dist']} && ./#{host['pe_installer']}#{pe_debug} #{host['pe_installer_conf_setting']}"
           end
         end
 
@@ -433,16 +436,27 @@ module Beaker
                 acceptable_codes = host['platform'] =~ /osx/ ? [1] : [0, 1]
                 setup_defaults_and_config_helper_on(host, master, acceptable_codes)
               else
-                answers = BeakerAnswers::Answers.create(opts[:pe_ver] || host['pe_ver'], hosts, opts)
-                create_remote_file host, "#{host['working_dir']}/answers", answers.answer_string(host)
+                prepare_host_installer_options(host)
+                generate_installer_conf_file_for(host, hosts, opts)
                 on host, installer_cmd(host, opts)
                 configure_type_defaults_on(host)
               end
             end
 
-            # On each agent, we ensure the certificate is signed then shut down the agent
-            sign_certificate_for(host) unless masterless
-            stop_agent_on(host)
+            # On each agent, we ensure the certificate is signed
+            if !masterless
+              if [master, database, dashboard].include?(host) && use_meep?(host['pe_ver'])
+                # This step is not necessary for the core pe nodes when using meep
+              else
+                step "Sign certificate for #{host}" do
+                  sign_certificate_for(host)
+                end
+              end
+            end
+            # then shut down the agent
+            step "Shutting down agent for #{host}" do
+              stop_agent_on(host)
+            end
           end
 
           unless masterless
@@ -497,6 +511,92 @@ 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.
+        def use_meep?(version)
+          !version_is_less(version, MEEP_CUTOVER_VERSION) && ENV['INSTALLER_TYPE'] == 'meep'
+        end
+
+        # Set installer options on the passed *host* according to current
+        # version and external INSTALLER_TYPE setting.
+        #
+        # 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
+        def prepare_host_installer_options(host)
+          if use_meep?(host['pe_ver'])
+            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
+
+        # Adds in settings needed by BeakerAnswers:
+        #
+        # * :format => :bash or :hiera depending on which legacy or meep format we need
+        # * :include_legacy_database_defaults => true or false.  True
+        #   indicates that we are upgrading from a legacy version and
+        #   BeakerAnswers should include the database defaults for user
+        #   which were set for the legacy install.
+        #
+        # @param [Beaker::Host] host that we are generating answers for
+        # @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' ?
+            { :format => :hiera } :
+            { :format => :bash }
+
+          beaker_answers_opts[:include_legacy_database_defaults] =
+            opts[:type] == :upgrade && !use_meep?(host['previous_pe_ver'])
+
+          opts.merge(beaker_answers_opts)
+        end
+
+        # Generates a Beaker Answers object for the passed *host* and creates
+        # the answer or pe.conf configuration file on the *host* needed for
+        # 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'.
+        #
+        # @param [Beaker::Host] host The host to create a configuration file on
+        # @param [Array<Beaker::Host]> hosts All of the hosts to be configured
+        # @param [Hash] opts The Beaker options hash
+        # @return [BeakerAnswers::Answers] the generated answers object
+        def generate_installer_conf_file_for(host, hosts, opts)
+          beaker_answers_opts = setup_beaker_answers_opts(host, opts)
+          answers = BeakerAnswers::Answers.create(
+            opts[:pe_ver] || host['pe_ver'], hosts, beaker_answers_opts
+          )
+          configuration = answers.installer_configuration_string(host)
+
+          step "Generate the #{host['pe_installer_conf_file']} on #{host}" do
+            logger.debug(configuration)
+            create_remote_file(host, host['pe_installer_conf_file'], configuration)
+          end
+
+          answers
+        end
+
         # Builds the agent_only and not_agent_only arrays needed for installation.
         #
         # @param [Array<Host>]          hosts hosts to split up into the arrays
@@ -657,6 +757,7 @@ module Beaker
         #  prep_host_for_upgrade(master, {}, "http://neptune.puppetlabs.lan/3.0/ci-ready/")
         def prep_host_for_upgrade(host, opts={}, path='')
           host['pe_dir'] = host['pe_upgrade_dir'] || path
+          host['previous_pe_ver'] = host['pe_ver']
           if host['platform'] =~ /windows/
             host['pe_ver'] = host['pe_upgrade_ver'] || opts['pe_upgrade_ver'] ||
               Options::PEVersionScraper.load_pe_version(host['pe_dir'], opts[:pe_version_file_win])
@@ -675,9 +776,8 @@ module Beaker
         #                    The host object must have the 'working_dir', 'dist' and 'pe_installer' field set correctly.
         # @api private
         def higgs_installer_cmd host
-
-          "cd #{host['working_dir']}/#{host['dist']} ; nohup ./#{host['pe_installer']} <<<Y > #{host['higgs_file']} 2>&1 &"
-
+          higgs_answer = host['pe_installer_type'] == 'meep' ? '1' : 'Y'
+          "cd #{host['working_dir']}/#{host['dist']} ; nohup ./#{host['pe_installer']} <<<#{higgs_answer} > #{host['higgs_file']} 2>&1 &"
         end
 
         #Perform a Puppet Enterprise Higgs install up until web browser interaction is required, runs on linux hosts only.
@@ -710,6 +810,8 @@ module Beaker
           fetch_pe([host], opts)
 
           host['higgs_file'] = "higgs_#{File.basename(host['working_dir'])}.log"
+
+          prepare_host_installer_options(host)
           on host, higgs_installer_cmd(host), opts
 
           #wait for output to host['higgs_file']

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.2.0'
+        STRING = '0.3.0'
       end
 
     end

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

@@ -10,7 +10,11 @@ class ClassMixedWithDSLInstallUtils
   include Beaker::DSL::Patterns
   include Beaker::DSL::PE
 
-  attr_accessor :hosts
+  attr_accessor :hosts, :metadata
+
+  def initialize
+    @metadata = {}
+  end
 
   # Because some the methods now actually call out to the `step` method, we need to
   # mock out `metadata` that is initialized in a test case.
@@ -46,7 +50,7 @@ describe ClassMixedWithDSLInstallUtils do
                                                 :working_dir => '/tmp' } ) }
   let(:unixhost)      { make_host( 'unixhost', { :platform => 'linux',
                                                  :pe_ver => '3.0',
-                                                :type => 'pe',
+                                                 :type => 'pe',
                                                  :working_dir => '/tmp',
                                                  :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386' } ) }
   let(:eoshost)       { make_host( 'eoshost', { :platform => 'eos',
@@ -188,26 +192,27 @@ describe ClassMixedWithDSLInstallUtils do
     it 'generates a unix PE install command for a unix host' do
       the_host = unixhost.dup
       the_host['pe_installer'] = 'puppet-enterprise-installer'
+      the_host['pe_installer_conf_setting'] = '-a /tmp/answers'
       expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp/puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386 && ./puppet-enterprise-installer -a /tmp/answers"
     end
 
     it 'generates a unix PE frictionless install command for a unix host with role "frictionless"' do
-      allow( subject ).to receive( :version_is_less ).and_return( false )
       allow( subject ).to receive( :master ).and_return( 'testmaster' )
       the_host = unixhost.dup
+      the_host['pe_ver'] = '3.8.0'
       the_host['pe_installer'] = 'puppet-enterprise-installer'
       the_host['roles'] = ['frictionless']
-      expect( subject.installer_cmd( the_host, {} ) ).to be ===  "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.0/install.bash && bash install.bash"
+      expect( subject.installer_cmd( the_host, {} ) ).to be ===  "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.8.0/install.bash && bash install.bash"
     end
 
     it 'generates a unix PE frictionless install command for a unix host with role "frictionless" and "frictionless_options"' do
-      allow( subject ).to receive( :version_is_less ).and_return( false )
       allow( subject ).to receive( :master ).and_return( 'testmaster' )
       the_host = unixhost.dup
+      the_host['pe_ver'] = '3.8.0'
       the_host['pe_installer'] = 'puppet-enterprise-installer'
       the_host['roles'] = ['frictionless']
       the_host['frictionless_options'] = { 'main' => { 'dns_alt_names' => 'puppet' } }
-      expect( subject.installer_cmd( the_host, {} ) ).to be ===  "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.0/install.bash && bash install.bash main:dns_alt_names=puppet"
+      expect( subject.installer_cmd( the_host, {} ) ).to be ===  "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.8.0/install.bash && bash install.bash main:dns_alt_names=puppet"
     end
 
     it 'generates a osx PE install command for a osx host' do
@@ -225,6 +230,7 @@ describe ClassMixedWithDSLInstallUtils do
     it 'generates a unix PE install command in verbose for a unix host when pe_debug is enabled' do
       the_host = unixhost.dup
       the_host['pe_installer'] = 'puppet-enterprise-installer'
+      the_host['pe_installer_conf_setting'] = '-a /tmp/answers'
       the_host[:pe_debug] = true
       expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp/puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386 && ./puppet-enterprise-installer -D -a /tmp/answers"
     end
@@ -237,17 +243,241 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it 'generates a unix PE frictionless install command in verbose for a unix host with role "frictionless" and pe_debug is enabled' do
-      allow( subject ).to receive( :version_is_less ).and_return( false )
       allow( subject ).to receive( :master ).and_return( 'testmaster' )
       the_host = unixhost.dup
+      the_host['pe_ver'] = '3.8.0'
       the_host['pe_installer'] = 'puppet-enterprise-installer'
       the_host['roles'] = ['frictionless']
       the_host[:pe_debug] = true
-      expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.0/install.bash && bash -x install.bash"
+      expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.8.0/install.bash && bash -x install.bash"
+    end
+
+  end
+
+  describe 'higgs installer' do
+    let(:host) { unixhost }
+    let(:higgs_regex) { %r{cd .* ; nohup \./puppet-enterprise-installer <<<#{higgs_answer} .*} }
+    before(:each) do
+      host['pe_installer'] = 'puppet-enterprise-installer'
+    end
+
+    def prep_host(host)
+      allow(subject).to receive(:sleep)
+      allow(host).to receive(:tmpdir).and_return('/tmp')
+      allow(subject).to receive(:fetch_pe)
+      expect(subject).to receive(:on).with(host, higgs_regex, opts).once
+      result = double(Beaker::Result, :stdout => 'Please go to https://somewhere in your browser to continue installation')
+      expect(subject).to receive(:on).with(host, %r{cd .* && cat .*}, anything)
+        .and_return(result)
+    end
+
+    context 'for legacy installer' do
+      let(:higgs_answer) { 'Y' }
+
+      context 'the higgs_installer_cmd' do
+        it 'returns correct command to invoke Higgs' do
+          expect(subject.higgs_installer_cmd(host)).to match(higgs_regex)
+        end
+      end
+
+      context 'the do_higgs_install' do
+        it 'submits the correct installer cmd to invoke Higgs' do
+          prep_host(host)
+          subject.do_higgs_install(host, opts)
+        end
+      end
+    end
+
+    context 'for meep installer' 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)
+          expect(subject.higgs_installer_cmd(host)).to match(higgs_regex)
+        end
+      end
+
+      context 'the do_higgs_install' do
+        it 'submits the correct installer cmd to invoke Higgs' do
+          prep_host(host)
+          subject.do_higgs_install(host, opts)
+        end
+      end
+    end
+  end
+
+  describe 'prepare_host_installer_options' do
+    let(:legacy_settings) 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) }
+    end
+
+    context 'when version < 2016.2.0' do
+      let(:pe_ver) { '3.8.5' }
+
+      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
+      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
+    end
   end
 
+  describe 'generate_installer_conf_file_for' do
+    let(:master) { hosts.first }
+
+    it 'generates a legacy answer file if host["pe_installer_type"]=="legacy"' do
+      master['pe_installer_conf_file'] = '/tmp/answers'
+      master['pe_installer_type'] = 'legacy'
+      expect(subject).to receive(:create_remote_file).with(
+        master,
+        '/tmp/answers',
+        %r{q_install=y.*q_puppetmaster_certname=#{master}}m
+      )
+      subject.generate_installer_conf_file_for(master, hosts, opts)
+    end
+
+    it 'generates a meep config file if host["pe_installer_type"]=="meep"' 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,
+        '/tmp/pe.conf',
+        %r{\{.*"puppet_enterprise::puppet_master_host": "#{master.hostname}"}m
+      )
+      subject.generate_installer_conf_file_for(master, hosts, opts)
+    end
+  end
+
+  describe 'setup_beaker_answers_opts' do
+    let(:opts) { {} }
+    let(:host) { hosts.first }
+
+    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,
+            :include_legacy_database_defaults => false,
+          )
+        )
+      end
+    end
+
+    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
+        expect(subject.setup_beaker_answers_opts(host, opts)).to eq(
+          opts.merge(
+            :format => :hiera,
+            :include_legacy_database_defaults => false,
+          )
+        )
+      end
+
+      context 'when upgrading' do
+        let(:opts) { { :type => :upgrade } }
+
+        context 'from meep' do
+          it 'sets legacy password defaults false' do
+            host['pe_ver'] = '2016.2.1'
+            host['previous_pe_ver'] = '2016.2.0'
+            expect(subject.setup_beaker_answers_opts(host, opts)).to eq(
+              opts.merge(
+                :format => :hiera,
+                :include_legacy_database_defaults => false,
+              )
+            )
+          end
+        end
+
+        context 'from legacy' do
+          it 'sets legacy password defaults to true' do
+            host['previous_pe_ver'] = '3.8.5'
+            expect(subject.setup_beaker_answers_opts(host, opts)).to eq(
+              opts.merge(
+                :format => :hiera,
+                :include_legacy_database_defaults => true,
+              )
+            )
+          end
+        end
+      end
+    end
+  end
 
   describe 'fetch_pe' do
 
@@ -295,7 +525,6 @@ describe ClassMixedWithDSLInstallUtils do
       end
       allow( subject ).to receive( :on ).and_return( true )
 
-      path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar'
       expect( subject ).to receive( :fetch_and_push_pe ).with( unixhost, anything, filename, extension ).once
@@ -320,7 +549,6 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :link_exists? ).and_return( true ) #is a tar.gz
       allow( subject ).to receive( :on ).and_return( true )
 
-      path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar.gz'
       expect( subject ).to receive( :fetch_and_push_pe ).with( unixhost, anything, filename, extension ).once
@@ -380,7 +608,6 @@ describe ClassMixedWithDSLInstallUtils do
 
       expect( subject).to_not receive(:scp_to)
       expect( subject).to_not receive(:on)
-      allow( subject ).to receive(:version_is_less).with('3.2.0', '3.2.0').and_return(false)
       subject.fetch_pe( [unixhost], {} )
     end
   end
@@ -394,13 +621,6 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
       allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('3.0')
-      allow( subject ).to receive( :version_is_less ).with('3.0', '4.0').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '3.4').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '3.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '3.99').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('3.99', '3.0').and_return( false )
-      allow( subject ).to receive( :check_puppetdb_status_endpoint ).and_return( nil )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '2016.1.0').and_return( false )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -438,7 +658,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :stop_agent_on ).with( hosts[3] ).once
       # We wait for puppetdb to restart 3 times; once before the first puppet run, and then during each puppet run
       expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times
-      # Each puppet agent runs twice, once for the initial run, and once to configure mcollective
+      #run each puppet agent (also captures the final run below)
       expect( subject ).to receive( :on ).with( hosts[0], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
       expect( subject ).to receive( :on ).with( hosts[1], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
       expect( subject ).to receive( :on ).with( hosts[2], /puppet agent -t/, :acceptable_exit_codes => [0,2] ).twice
@@ -446,6 +666,9 @@ describe ClassMixedWithDSLInstallUtils do
       #run rake task on dashboard
 
       expect( subject ).to receive( :on ).with( hosts[0], /\/opt\/puppet\/bin\/rake -sf \/opt\/puppet\/share\/puppet-dashboard\/Rakefile .* RAILS_ENV=production/ ).once
+      #wait for all hosts to appear in the dashboard
+      #run puppet agent now that installation is complete
+      # This is captured above (run each puppet agent)
 
       hosts.each do |host|
         allow( host ).to receive( :tmpdir )
@@ -468,9 +691,6 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :create_remote_file ).and_return( true )
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :max_version ).with(['3.0'], '3.8').and_return('3.0')
-      allow( subject ).to receive( :version_is_less ).with('3.99', '3.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with(anything, '3.2.0').exactly(hosts.length + 1).times.and_return( false )
-      allow( subject ).to receive( :version_is_less ).with(anything, '4.0').exactly(hosts.length + 1).times.and_return( true )
 
       expect( subject ).to receive( :on ).with( hosts[0], /puppet-enterprise-installer/ ).once
       expect( subject ).to receive( :create_remote_file ).with( hosts[0], /answers/, /q/ ).once
@@ -506,14 +726,6 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
       allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
-      allow( subject ).to receive( :version_is_less ).with('4.0', '4.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.4').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('3.99', '4.0').and_return( true )
-      # pe_ver is only set on the hosts for this test, not the opt
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.99').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '2016.1.0').and_return( false )
-      allow( subject ).to receive( :check_puppetdb_status_endpoint ).and_return( nil )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -540,6 +752,9 @@ describe ClassMixedWithDSLInstallUtils do
       end
       # We wait for puppetdb to restart 3 times; once before the first puppet run, and then during each puppet run
       expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times
+      #wait for all hosts to appear in the dashboard
+      #run puppet agent now that installation is complete
+      # tested above in the hosts loop ^^
 
       hosts.each do |host|
         allow( host ).to receive( :tmpdir )
@@ -568,15 +783,6 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
       allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
-      allow( subject ).to receive( :version_is_less ).with('4.0', '4.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.4').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('3.99', '4.0').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('3.8', '4.0').and_return( true )
-      # pe_ver is only set on the hosts for this test, not the opt
-      allow( subject ).to receive( :version_is_less ).with('4.0', '2016.1.0').and_return( false )
-      allow( subject ).to receive( :check_puppetdb_status_endpoint ).and_return( nil )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.99').and_return( true )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -602,6 +808,9 @@ describe ClassMixedWithDSLInstallUtils do
       end
       #  We wait for puppetdb to restart 3 times; once before the first puppet run, and then during each puppet run
       expect( subject ).to receive( :sleep_until_puppetdb_started ).with( hosts[0] ).exactly(3).times
+      #wait for all hosts to appear in the dashboard
+      #run puppet agent now that installation is complete
+      # tested above in the hosts loop ^^
 
       hosts.each do |host|
         allow( host ).to receive( :tmpdir )
@@ -613,6 +822,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'sets puppet-agent acceptable_exit_codes correctly for config helper on upgrade' do
       hosts = make_hosts({
+                           :previous_pe_ver => '3.0',
                            :pe_ver => '4.0',
                            :roles => ['agent'],
                          }, 2)
@@ -628,15 +838,6 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
       allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
-      allow( subject ).to receive( :version_is_less ).with('4.0', '4.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.4').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.0').and_return( false )
-      allow( subject ).to receive( :version_is_less ).with('3.99', '4.0').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('3.8', '4.0').and_return( true )
-      # pe_ver is only set on the hosts for this test, not the opt
-      allow( subject ).to receive( :version_is_less ).with('4.0', '3.99').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('4.0', '2016.1.0').and_return( false )
-      allow( subject ).to receive( :check_puppetdb_status_endpoint ).and_return( nil )
       allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
       allow( subject ).to receive( :puppet_agent ) do |arg|
         "puppet agent #{arg}"
@@ -783,9 +984,6 @@ describe ClassMixedWithDSLInstallUtils do
       the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
       allow( subject ).to receive( :hosts ).and_return( the_hosts )
       allow( subject ).to receive( :options ).and_return( {} )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '3.4.0').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('2.8', '3.0').and_return( true )
-      version = version_win = '2.8'
       path = "/path/to/upgradepkg"
       expect( subject ).to receive( :do_install ).with( the_hosts, {:type=>:upgrade, :set_console_password=>true} )
       subject.upgrade_pe( path )
@@ -800,9 +998,6 @@ describe ClassMixedWithDSLInstallUtils do
       the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
       allow( subject ).to receive( :hosts ).and_return( the_hosts )
       allow( subject ).to receive( :options ).and_return( {} )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '3.4.0').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('3.1', '3.0').and_return( false )
-      version = version_win = '3.1'
       path = "/path/to/upgradepkg"
       expect( subject ).to receive( :do_install ).with( the_hosts, {:type=>:upgrade, :set_console_password=>true} )
       subject.upgrade_pe( path )
@@ -817,9 +1012,6 @@ describe ClassMixedWithDSLInstallUtils do
       the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
       allow( subject ).to receive( :hosts ).and_return( the_hosts )
       allow( subject ).to receive( :options ).and_return( {} )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '3.4.0').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('2.8', '3.0').and_return( true )
-      version = version_win = '2.8'
       path = "/path/to/upgradepkg"
       expect( subject ).to receive( :do_install ).with( the_hosts, {:type=>:upgrade, :set_console_password=>true} )
       subject.upgrade_pe( path )
@@ -832,15 +1024,22 @@ describe ClassMixedWithDSLInstallUtils do
       allow( Beaker::Options::PEVersionScraper ).to receive( :load_pe_version ).and_return( '3.1' )
       allow( Beaker::Options::PEVersionScraper ).to receive( :load_pe_version_win ).and_return( '3.1' )
       allow( subject ).to receive( :hosts ).and_return( hosts )
-      allow( subject ).to receive( :version_is_less ).with('3.0', '3.4.0').and_return( true )
-      allow( subject ).to receive( :version_is_less ).with('3.1', '3.0').and_return( false )
       allow( subject ).to receive( :sorted_hosts ).and_return( [hosts[0]] )
-      version = version_win = '3.1'
       path = "/path/to/upgradepkg"
       expect( subject ).to receive( :do_install ).with( [hosts[0]], {:type=>:upgrade, :set_console_password=>true} )
       subject.upgrade_pe_on(hosts[0], {}, path)
     end
 
+    it 'sets previous_pe_ver' do
+      subject.hosts = hosts
+      host = hosts[0]
+      host['pe_ver'] = '3.8.5'
+      host['pe_upgrade_ver'] = '2016.2.0'
+      expect(subject).to receive(:do_install).with([host], Hash)
+      subject.upgrade_pe_on([host], {})
+      expect(host['pe_ver']).to eq('2016.2.0')
+      expect(host['previous_pe_ver']).to eq('3.8.5')
+    end
   end
 
   describe 'fetch_and_push_pe' do

data/spec/helpers.rb

@@ -83,6 +83,7 @@ module HostHelpers
     host = make_opts.merge(host_hash)
 
     allow(host).to receive( :name ).and_return( name )
+    allow(host).to receive( :hostname ).and_return( "#{name}.test" )
     allow(host).to receive( :to_s ).and_return( name )
     allow(host).to receive( :exec ).and_return( generate_result( name, host_hash ) )
     host

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec