beaker-puppet_install_helper 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b427a76ae0d653988c28f41405dcd28c741028
-  data.tar.gz: 0d158cf962f91151a189f576b5f7b49020b03aa4
+  metadata.gz: 4671087136928e9adda784a24f1ea5577e5b6b68
+  data.tar.gz: 5f785c6f41fd90a0a7b0c578b321910c5fec3c77
 SHA512:
-  metadata.gz: 615e51ff6f078ee5b122dcf810b6e800f79bc08358f19928bfed8be0f59e5dae2f39d55fbdbeac256965bb0bb83b70b0857182c95d19ccbeb57d9ffeb6445285
-  data.tar.gz: 738c89b9f4d17d4f357447a710b8134917dde093ddff4027723e9d89d6751a5641887fa39fa679cdcc4beba80b1e58145b3794d49a6547c822157f189719b985
+  metadata.gz: cc2780d965a5f86cf072b373bf3b9da60cae36dd123a84b3b06fed1b9cd60e607fa10d81fa1387a041988409e2b69e6ada775ec984ad81ce1da74df8e7789f73
+  data.tar.gz: f898be72b22bfbaa300370cd3df8f7eaeb4d60377a45404a938bfb97c55f69cbfcb4f8474e777349f9070fb95e5d4c28d44ad96b9e06dd8d85712a68ed6857c3

data/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.9.0]
+### Changed
+- Use `BEAKER_IS_PE` instead of `PUPPET_INSTALL_TYPE` to specify whether a run should be PE or agent.
+- Use `BEAKER_PUPPET_COLLECTION` instead of `PUPPET_INSTALL_TYPE` to specify puppet5, puppet6-nightly, etc. collections.
+- Use `BEAKER_PUPPET_AGENT_VERSION` instead of `PUPPET_INSTALL_VERSION`
+- Use `BEAKER_PUPPET_AGENT_SHA` instead of `PUPPET_AGENT_SHA`
+
+### Fixed
+- Beaker only cares about the SHA and no longer cares about `PUPPET_AGENT_SUITE_VERSION` so deprecating that variable. See (the beaker source)[https://github.com/puppetlabs/beaker-puppet/blob/63ea32a0d7caa8f261c533b020625de19569f971/lib/beaker-puppet/install_utils/foss_utils.rb#L1150-L1152]
+
+## [0.8.0]
+### Changed
+- Changed the default `PUPPET_INSTALL_TYPE` from "agent" (puppet 4) to "puppet5"
+
+### Added
+- Added puppet5 and puppet6-nightly ability.
+
 ## [0.7.1]
 ### Fixed
 - Reverted adding the bin folder to $PATH on non-windows
@@ -43,6 +60,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Add solaris for installing CA certs as well.
 
+[0.8.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.7.1...0.8.0
 [0.7.1]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.7.0...0.7.1
 [0.7.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.6.0...0.7.0
 [0.6.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.5.0...0.6.0

data/README.md

@@ -4,24 +4,15 @@ This gem is simply an abstraction for the various ways that we install puppet fr
 
 ### `run_puppet_install_helper`
 
-The way to use this is to declare either `run_puppet_install_helper()` or `run_puppet_install_helper_on(hosts)` and set environment variables `PUPPET_INSTALL_VERSION` and/or `PUPPET_INSTALL_TYPE` in the following combinations to have puppet installed on the desired hosts:
+The way to use this is to declare either `run_puppet_install_helper()` or `run_puppet_install_helper_on(hosts)` and set environment variables `BEAKER_PUPPET_AGENT_VERSION` and/or `BEAKER_PUPPET_COLLECTION` in the following combinations to have puppet installed on the desired hosts. The nodeset should be configured with `type: pe` or `type: aio` to control the type of install.
 
-- `PUPPET_INSTALL_TYPE` is unset: if `type: pe` is set for the default node in the nodeset, it will us the PE install method. Otherwise it will only install an agent.
-- `PUPPET_INSTALL_TYPE=pe` will read `PUPPET_INSTALL_VERSION` and attempt to install that version of the PE tarball. If no version is set, then it uses the latest stable build.
-- `PUPPET_INSTALL_TYPE=agent` will read `PUPPET_INSTALL_VERSION` and install that version of puppet-agent (eg, `PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.0.0`)
-- `PUPPET_INSTALL_TYPE=foss` will read `PUPPET_INSTALL_VERSION` and:
-  - if `PUPPET_INSTALL_VERSION` is less than 4 will attempt to install that version of the system package if available, or else the ruby gem of that version.
-  - if `PUPPET_INSTALL_VERSION` is 4 or more it will attempt to install the corresponding puppet-agent package, or gem version otherwise.
-  - if a `master` role is defined, will install puppetserver on that node. Note that the corresponding puppet-agent dependency will be installed on that node rather than the specified `PUPPET_INSTALL_VERSION`.
+- `BEAKER_PUPPET_COLLECTION=<puppet collection>` will install the specified `BEAKER_PUPPET_AGENT_VERSION` from the specified collection. Valid values are `pc1`, `puppet5`, `puppet6-nightly` etc. This may change with time.
+- `BEAKER_PUPPET_AGENT_VERSION=<version>` to specify
+- `BEAKER_IS_PE=<yes or no>` may be used to force a nodeset to be PE or not, regardless of the nodeset `type` or absence thereof.
+- `BEAKER_PUPPET_AGENT_SHA=<sha>` may be used in order to use a development puppet-agent package.
+- `PUPPET_INSTALL_TYPE=foss` may be used to install foss puppet 3.x, but is deprecated and should not be used.
 
-The best way is explicitly set `PUPPET_INSTALL_TYPE` and `PUPPET_INSTALL_VERSION` to what you want. It'll probably do what you expect.
-
-#### Installing a puppet-agent package from a development repository
-
-In order to use a custom, or unreleased, puppet-agent package set the following environment variables"
-- `PUPPET_INSTALL_TYPE=agent`
-- `PUPPET_AGENT_SHA` is the longform commit SHA used when building the puppet-agent package, for example `PUPPET_AGENT_SHA=18d31fd5ed41abb276398201f84a4347e0fc7092`.  This is required to be set in order to use a development puppet-agent package
-- `PUPPET_AGENT_SUITE_VERSION` is the version of the puppet-agent package, for example `PUPPET_AGENT_SUITE_VERSION="1.8.2.350.g18d31fd`.  This is optional, and will default to `PUPPET_AGENT_SHA` if not set
+The best way is explicitly set `BEAKER_PUPPET_COLLECTION` and `BEAKER_PUPPET_AGENT_VERSION` to what you want. It'll probably do what you expect.
 
 ### `install_ca_certs`
 

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'beaker-puppet_install_helper'
-  s.version     = '0.7.1'
+  s.version     = '0.9.0'
   s.authors     = ['Puppetlabs']
   s.email       = ['hunter@puppet.com']
   s.homepage    = 'https://github.com/puppetlabs/beaker-puppet_install_helper'

data/lib/beaker/puppet_install_helper.rb

@@ -7,36 +7,21 @@ module Beaker::PuppetInstallHelper
   end
 
   # Takes a host(s) object, install type string, and install version string.
-  # - Type defaults to PE for PE nodes, and foss otherwise.
-  # - Version will default to the latest 3x foss/pe package, depending on type
   def run_puppet_install_helper_on(hosts, type_arg = find_install_type, version = find_install_version)
     type = type_arg || find_install_type
 
     # Short circuit based on rspec-system and beaker variables
     if (ENV['RS_PROVISION'] == 'no') || (ENV['BEAKER_provision'] == 'no')
-      Array(hosts).each do |host|
-        case type
-        when 'pe'
-          configure_pe_defaults_on(host)
-        when /foss|agent/
-          configure_foss_defaults_on(host)
-        end
-      end
+      configure_type_defaults_on(hosts)
       return
     end
 
     # Example environment variables to be read:
-    # PUPPET_INSTALL_VERSION=3.8.1 <-- for foss/pe/gem
-    # PUPPET_INSTALL_VERSION=4.1.0 <-- for agent/gem
-    # PUPPET_INSTALL_VERSION=1.0.1 <-- for agent
-    #
-    # PUPPET_INSTALL_TYPE=pe
-    # PUPPET_INSTALL_TYPE=foss
-    # PUPPET_INSTALL_TYPE=agent
-
-    # For PUPPET_INSTALL_TYPE=agent and using a development version of Puppet Agent
-    # PUPPET_AGENT_SHA=18d31fd5ed41abb276398201f84a4347e0fc7092   <-- Required.  Long form commit SHA used to build the Puppet Agent
-    # PUPPET_AGENT_SUITE_VERSION=1.8.2.350.g18d31fd               <-- Optiona. Version string for the Puppet Agent
+    # BEAKER_PUPPET_COLLECTION=pc1 <-- for latest 4.x
+    # BEAKER_PUPPET_COLLECTION=puppet5 <-- for latest 5.x
+    # BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_PUPPET_AGENT_VERSION=5.3.1 <-- for specific version
+    # BEAKER_PUPPET_COLLECTION=puppet6-nightly <-- for latest nightly build
+    # BEAKER_PUPPET_AGENT_SHA=0ed2bbc918326263da9d97d0361a9e9303b52938 <-- for specific dev build
 
     # Ensure windows 2003 is always set to 32 bit
     Array(hosts).each do |host|
@@ -55,9 +40,12 @@ module Beaker::PuppetInstallHelper
         if hosts_with_role(hosts, 'master').length>0 then
           next if host == master
         end
+        # XXX install_puppet_on() will call install_puppet_agent_on() if there
+        # is a :version option >= 4.x passed, but does foss by default.
         install_puppet_on(host, opts)
       end
       if hosts_with_role(hosts, 'master').length>0 then
+        # TODO Make the puppetserver code work with puppet5/puppet6
         # install puppetserver
         install_puppetlabs_release_repo( master, 'pc1' )
         master.install_package('puppetserver')
@@ -94,13 +82,11 @@ module Beaker::PuppetInstallHelper
         end
       end
     when 'agent'
-      if ENV['PUPPET_AGENT_SHA'].nil?
-        # This will fail on hosts that are not supported; use foss and specify a 4.x version instead
+      if find_agent_sha.nil?
         install_puppet_agent_on(hosts, options.merge(version: version))
       else
-        opts = options.merge(puppet_collection: 'PC1',
-                             puppet_agent_sha: ENV['PUPPET_AGENT_SHA'],
-                             puppet_agent_version: ENV['PUPPET_AGENT_SUITE_VERSION'] || ENV['PUPPET_AGENT_SHA'])
+        opts = options.merge(puppet_agent_sha: find_agent_sha,
+                             puppet_agent_version: ENV['PUPPET_AGENT_SUITE_VERSION'] || find_agent_sha)
         install_puppet_agent_dev_repo_on(hosts, opts)
       end
 
@@ -114,6 +100,7 @@ module Beaker::PuppetInstallHelper
   end
 
   def find_install_type
+    # XXX Just use default.is_pe? when PUPPET_INSTALL_TYPE=foss is removed.
     ENV['PUPPET_INSTALL_TYPE'] || if default.is_pe?
                                     'pe'
                                   else
@@ -121,8 +108,12 @@ module Beaker::PuppetInstallHelper
                                   end
   end
 
+  def find_agent_sha
+    ENV['BEAKER_PUPPET_AGENT_SHA'] || ENV['PUPPET_AGENT_SHA']
+  end
+
   def find_install_version
-    ENV['PUPPET_INSTALL_VERSION'] || ENV['PUPPET_VERSION']
+    ENV['BEAKER_PUPPET_AGENT_VERSION'] || ENV['PUPPET_INSTALL_VERSION'] || ENV['PUPPET_VERSION']
   end
 end
 

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -24,6 +24,7 @@ describe 'Beaker::PuppetInstallHelper' do
     allow(subject).to receive(:on)
     allow(subject).to receive(:fact_on)
     allow(subject).to receive(:agents).and_return(hosts)
+    allow(subject).to receive(:default).and_return(hosts[0])
   end
   after :each do
     ENV.delete('PUPPET_VERSION')
@@ -31,17 +32,20 @@ describe 'Beaker::PuppetInstallHelper' do
     ENV.delete('PUPPET_INSTALL_TYPE')
     ENV.delete('PUPPET_AGENT_SHA')
     ENV.delete('PUPPET_AGENT_SUITE_VERSION')
+    ENV.delete('BEAKER_IS_PE')
+    ENV.delete('BEAKER_PUPPET_COLLECTION')
+    ENV.delete('BEAKER_PUPPET_AGENT_VERSION')
+    ENV.delete('BEAKER_PUPPET_AGENT_SHA')
   end
   describe '#run_puppet_install_helper' do
     before :each do
       allow(subject).to receive(:hosts).and_return(hosts)
-      allow(subject).to receive(:default).and_return(hosts[0])
     end
     it 'calls run_puppet_install_helper_on on each host' do
       expect(subject).to receive(:run_puppet_install_helper_on).with(hosts, 'agent', nil)
       subject.run_puppet_install_helper
     end
-    %w(PUPPET_VERSION PUPPET_INSTALL_VERSION).each do |version_var|
+    %w(BEAKER_PUPPET_AGENT_VERSION PUPPET_VERSION PUPPET_INSTALL_VERSION).each do |version_var|
       it 'calls run_puppet_install_helper_on on each host with a version ' do
         ENV[version_var] = '4.1.0'
         expect(subject).to receive(:run_puppet_install_helper_on).with(hosts, 'agent', '4.1.0')
@@ -73,64 +77,125 @@ describe 'Beaker::PuppetInstallHelper' do
         subject.run_puppet_install_helper_on(hosts)
       end
     end
-    context 'for foss' do
-      let :hosts do
-        foss_host = double(is_pe?: false)
-        foss_master = double(is_pe?: false)
-        allow(foss_host).to receive(:[]).with('distmoduledir').and_return('/dne')
-        allow(foss_host).to receive(:[]).with('platform').and_return('Debian')
-        allow(foss_host).to receive(:[]).with('pe_ver').and_return(nil)
-        allow(foss_host).to receive(:[]).with('roles').and_return(['agent'])
-        allow(foss_host).to receive(:puppet).and_return('hiera_config' => '/dne')
-        allow(foss_master).to receive(:[]).with('pe_ver').and_return(nil)
-        allow(foss_master).to receive(:[]=).with('distmoduledir', 'foo')
-        allow(foss_master).to receive(:[]).with('platform').and_return('Debian')
-        allow(foss_master).to receive(:[]).with('roles').and_return(['master'])
-        allow(foss_master).to receive(:get_ip).and_return('1.2.3.4')
-        allow(foss_master).to receive(:install_package).with('puppetserver')
-        allow(foss_master).to receive(:get_ip).and_return('1.2.3.4')
-        [foss_host, foss_master]
-      end
-      let :result do
-        Beaker::Result.new( nil, nil )
-      end
-      before :each do
-        allow(subject).to receive(:master).and_return(hosts[1])
-        allow(subject).to receive(:sign_certificate_for)
-        allow(subject).to receive(:puppet_agent)
-        allow(subject).to receive(:puppet).with('resource', 'service', 'puppetserver', 'ensure=running')
-        allow(subject).to receive(:puppet).with('resource', 'host', 'puppet', 'ensure=present', 'ip=1.2.3.4')
-        allow(subject).to receive(:puppet).with('agent', '--test')
-        allow(subject).to receive(:puppet).with('config', 'print', 'modulepath')
-        allow(subject).to receive(:on).and_return(result)
-        result.stdout = 'foo:bar'
-      end
-      it 'uses foss explicitly' do
-        ENV['PUPPET_INSTALL_TYPE'] = 'foss'
-        expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
-        expect(subject).to receive(:install_puppet_on).with(hosts[0], version: nil, default_action: 'gem_install')
-        subject.run_puppet_install_helper_on(hosts)
-      end
-      %w(PUPPET_VERSION PUPPET_INSTALL_VERSION).each do |version_var|
-        it 'uses foss with a version' do
-          ENV['PUPPET_INSTALL_TYPE'] = 'foss'
-          ENV[version_var] = '3.8.1'
-          expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
-          expect(subject).to receive(:install_puppet_on).with(hosts[0], version: '3.8.1', default_action: 'gem_install')
-          subject.run_puppet_install_helper_on(hosts)
+    context 'for non-pe' do
+      context 'and foss type' do
+        let :hosts do
+          foss_host = double(is_pe?: false)
+          foss_master = double(is_pe?: false)
+          allow(foss_host).to receive(:[]).with('distmoduledir').and_return('/dne')
+          allow(foss_host).to receive(:[]).with('platform').and_return('Debian')
+          allow(foss_host).to receive(:[]).with('pe_ver').and_return(nil)
+          allow(foss_host).to receive(:[]).with('roles').and_return(['agent'])
+          allow(foss_host).to receive(:puppet).and_return('hiera_config' => '/dne')
+          allow(foss_master).to receive(:[]).with('pe_ver').and_return(nil)
+          allow(foss_master).to receive(:[]=).with('distmoduledir', 'foo')
+          allow(foss_master).to receive(:[]).with('platform').and_return('Debian')
+          allow(foss_master).to receive(:[]).with('roles').and_return(['master'])
+          allow(foss_master).to receive(:get_ip).and_return('1.2.3.4')
+          allow(foss_master).to receive(:install_package).with('puppetserver')
+          allow(foss_master).to receive(:get_ip).and_return('1.2.3.4')
+          [foss_host, foss_master]
+        end
+        let :result do
+          Beaker::Result.new( nil, nil )
+        end
+        before :each do
+          allow(subject).to receive(:master).and_return(hosts[1])
+          allow(subject).to receive(:sign_certificate_for)
+          allow(subject).to receive(:puppet_agent)
+          allow(subject).to receive(:puppet).with('resource', 'service', 'puppetserver', 'ensure=running')
+          allow(subject).to receive(:puppet).with('resource', 'host', 'puppet', 'ensure=present', 'ip=1.2.3.4')
+          allow(subject).to receive(:puppet).with('agent', '--test')
+          allow(subject).to receive(:puppet).with('config', 'print', 'modulepath')
+          allow(subject).to receive(:on).and_return(result)
+          result.stdout = 'foo:bar'
         end
-        it 'uses foss with a >4 version detects AIO' do
+        it 'uses foss explicitly' do
           ENV['PUPPET_INSTALL_TYPE'] = 'foss'
-          ENV[version_var] = '4.1.0'
           expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
-          expect(subject).to receive(:install_puppet_on).with(hosts[0], version: '4.1.0', default_action: 'gem_install')
-          expect(subject).to receive(:add_aio_defaults_on).with(hosts)
-          expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+          expect(subject).to receive(:install_puppet_on).with(hosts[0], version: nil, default_action: 'gem_install')
           subject.run_puppet_install_helper_on(hosts)
         end
+        %w(BEAKER_PUPPET_AGENT_VERSION PUPPET_VERSION PUPPET_INSTALL_VERSION).each do |version_var|
+          it 'uses foss with a version' do
+            ENV['PUPPET_INSTALL_TYPE'] = 'foss'
+            ENV[version_var] = '3.8.1'
+            expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
+            expect(subject).to receive(:install_puppet_on).with(hosts[0], version: '3.8.1', default_action: 'gem_install')
+            subject.run_puppet_install_helper_on(hosts)
+          end
+          it 'uses foss with a 4.x version detects AIO' do
+            ENV['PUPPET_INSTALL_TYPE'] = 'foss'
+            ENV[version_var] = '4.1.0'
+            expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
+            expect(subject).to receive(:install_puppet_on).with(hosts[0], version: '4.1.0', default_action: 'gem_install')
+            expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+            expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+            subject.run_puppet_install_helper_on(hosts)
+          end
+          it 'uses pc1 with a 5.x version; this fails' do
+            ENV['PUPPET_INSTALL_TYPE'] = 'foss'
+            ENV[version_var] = '5.1.0'
+            expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
+            expect(subject).to receive(:install_puppet_on).with(hosts[0], version: '5.1.0', default_action: 'gem_install')
+            expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+            expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+            subject.run_puppet_install_helper_on(hosts)
+          end
+        end
+      end
+      context 'for agent type' do
+        context 'with no collection' do
+          it 'uses agent by default for non-pe hosts' do
+            expect(subject).to receive(:install_puppet_agent_on).with(hosts, version: nil)
+            expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+            expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+            subject.run_puppet_install_helper_on(hosts)
+          end
+          it 'uses agent explicitly' do
+            ENV['PUPPET_INSTALL_TYPE'] = 'agent'
+            expect(subject).to receive(:install_puppet_agent_on).with(hosts, version: nil)
+            expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+            expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+            subject.run_puppet_install_helper_on(hosts)
+          end
+        end
+        ['puppet5', 'puppet6-nightly'].each do |collection|
+          context "with #{collection} collection" do
+            it "installs puppet-agent from #{collection} repo" do
+              ENV['BEAKER_PUPPET_COLLECTION'] = collection
+              expect(subject).to receive(:install_puppet_agent_on).with(hosts, version: nil)
+              expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+              expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+              subject.run_puppet_install_helper_on(hosts)
+            end
+          end
+        end
+        context 'with a specific development sha' do
+          it 'uses a development repo' do
+            ENV['BEAKER_PUPPET_AGENT_SHA'] = '0ed2bbc918326263da9d97d0361a9e9303b52938'
+            expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_agent_sha: '0ed2bbc918326263da9d97d0361a9e9303b52938', puppet_agent_version: '0ed2bbc918326263da9d97d0361a9e9303b52938')
+            expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+            expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+            subject.run_puppet_install_helper_on(hosts)
+          end
+          it 'uses a development repo with suite version and sha' do
+            ENV['BEAKER_PUPPET_AGENT_SHA'] = '0ed2bbc918326263da9d97d0361a9e9303b52938'
+            ENV['PUPPET_AGENT_SUITE_VERSION'] = '5.5.0.152.g0ed2bbc'
+            expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_agent_sha: '0ed2bbc918326263da9d97d0361a9e9303b52938', puppet_agent_version: '5.5.0.152.g0ed2bbc')
+            expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+            expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+            subject.run_puppet_install_helper_on(hosts)
+          end
+        end
       end
     end
     context 'for PE' do
+      it 'uses PE when default is a pe host' do
+        expect(subject).to receive(:default).and_return(hosts[1])
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
+        subject.run_puppet_install_helper_on(hosts)
+      end
       it 'uses PE explicitly' do
         ENV['PUPPET_INSTALL_TYPE'] = 'pe'
         expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
@@ -153,41 +218,5 @@ describe 'Beaker::PuppetInstallHelper' do
         subject.run_puppet_install_helper_on(hosts)
       end
     end
-    context 'for puppet-agent' do
-      it 'uses agent explicitly' do
-        ENV['PUPPET_INSTALL_TYPE'] = 'agent'
-        expect(subject).to receive(:install_puppet_agent_on).with(hosts, version: nil)
-        expect(subject).to receive(:add_aio_defaults_on).with(hosts)
-        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
-        subject.run_puppet_install_helper_on(hosts)
-      end
-      it 'uses foss with a version' do
-        ENV['PUPPET_INSTALL_TYPE'] = 'agent'
-        ENV['PUPPET_INSTALL_VERSION'] = '1.1.0'
-        expect(subject).to receive(:install_puppet_agent_on).with(hosts, version: '1.1.0')
-        expect(subject).to receive(:add_aio_defaults_on).with(hosts)
-        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
-        subject.run_puppet_install_helper_on(hosts)
-      end
-    end
-    context 'for puppet-agent development repo' do
-      before :each do
-        ENV['PUPPET_INSTALL_TYPE'] = 'agent'
-        ENV['PUPPET_AGENT_SHA'] = 'abc123'
-      end
-      it 'uses a development repo' do
-        expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_collection: 'PC1', puppet_agent_sha: 'abc123', puppet_agent_version: 'abc123')
-        expect(subject).to receive(:add_aio_defaults_on).with(hosts)
-        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
-        subject.run_puppet_install_helper_on(hosts)
-      end
-      it 'uses a development repo with suite version' do
-        ENV['PUPPET_AGENT_SUITE_VERSION'] = '1.0.0.0.gabc123'
-        expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_collection: 'PC1', puppet_agent_sha: 'abc123', puppet_agent_version: '1.0.0.0.gabc123')
-        expect(subject).to receive(:add_aio_defaults_on).with(hosts)
-        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
-        subject.run_puppet_install_helper_on(hosts)
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Puppet install helper for Beaker