beaker-puppet 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6454b6b6a2bb05e3b0ae6ba82f8238cccb73bfce
-  data.tar.gz: 958e42dc43c40e04f5aa8c69441c706d0bad6563
+  metadata.gz: 4d2efb4c745da178b7a32980b2057ceb9a80049a
+  data.tar.gz: 100e06d7c5847f1897e7b99723ff2a7d073c4125
 SHA512:
-  metadata.gz: 183642058a37616a50c16d42f8abb88589bc04ca69ee21da363581bc02510cb34abb118620228ad27215de8c31b2924421a796a09ce9cab2a30427bbbc7d1fd8
-  data.tar.gz: 13adb1d9345353a944582d5572e28def90d9c9a97f092780627f1ba75e212b2470cb4c82240d3832b53fc01b3e35221ace42d2b015cd75e6c375b5005cdf604c
+  metadata.gz: 3461becc565e5ca0f2144cffe9d4aca0c0d88dba63c3bb6bb434911a13b061d73b804247d50b66ee03ad259187060b242d2af3c4747e5dc71b96e5cd9efde728
+  data.tar.gz: 4450d6299416020c5f4635a712e48502da7569f53d92cb305f83f82bc721ac959668b2f8789c2949652a58312a30c4a0941032f9264acef1d07e3cd84b625b71

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -31,6 +31,9 @@ module Beaker
         # Github's ssh signature for cloning via ssh
         GitHubSig   = 'github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
 
+        # URL for public nightly builds
+        DEFAULT_NIGHTLY_BUILDS_URL = 'http://nightlies.puppet.com'
+
         # lookup project-specific git environment variables
         # PROJECT_VAR or VAR otherwise return the default
         #
@@ -41,6 +44,21 @@ module Beaker
           project_name && ENV[project_specific_name] || ENV[env_variable_name] || default
         end
 
+        # @return [Boolean] Whether Puppet's internal builds are accessible from all the SUTs
+        def dev_builds_accessible?
+          block_on hosts do |host|
+            return false unless dev_builds_accessible_on?(host)
+          end
+          true
+        end
+
+        # @param [Host] A beaker host
+        # @return [Boolean] Whether Puppet's internal builds are accessible from the host
+        def dev_builds_accessible_on?(host)
+          result = on(host, %(curl -fI "#{Puppet5::DEFAULT_DEV_BUILDS_URL}"), accept_all_exit_codes: true)
+          return result.exit_code.zero?
+        end
+
         # @param [String] project_name
         # @param [String] git_fork     When not provided will use PROJECT_FORK environment variable
         # @param [String] git_server   When not provided will use PROJECT_SERVER environment variable
@@ -309,7 +327,7 @@ module Beaker
           nil
         end
 
-        #Install Puppet Agent based on specified hosts using provided options
+        # Install Puppet Agent or Puppet as a gem based on specified hosts using provided options
         # @example will install puppet-agent 1.1.0 from native puppetlabs provided packages wherever possible and will fail over to gem installing latest puppet
         #  install_puppet_agent_on(hosts, {
         #    :puppet_agent_version          => '1.1.0',
@@ -331,7 +349,9 @@ module Beaker
         # @option opts [String] :puppet_gem_version Version of puppet to install via gem if no puppet-agent package is available
         # @option opts [String] :mac_download_url Url to download msi pattern of %url%/puppet-agent-%version%.msi
         # @option opts [String] :win_download_url Url to download dmg pattern of %url%/puppet-agent-%version%.msi
-        # @option opts [String] :puppet_collection Defaults to 'pc1'
+        # @option opts [String] :puppet_collection Collection to install from. Defaults to 'pc1' (contains the latest
+        #   puppet 4). Other valid options are 'puppet' (for the latest release), 'puppet5' (for the latest puppet 5),
+        #   or 'puppet6' (for the latest puppet 6). Only works for platforms that rely on repos.
         # @option opts [Boolean] :run_in_parallel Whether to run on each host in parallel.
         #
         # @return nil
@@ -339,13 +359,24 @@ module Beaker
         # @raise [FailTest] When error occurs during the actual installation process
         def install_puppet_agent_on(hosts, opts = {})
           opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
-          opts[:puppet_collection] ||= 'pc1' #hi!  i'm case sensitive!  be careful!
           opts[:puppet_agent_version] ||= opts[:version] #backwards compatability with old parameter name
+          opts[:puppet_collection] ||= puppet_collection_for(:puppet_agent, opts[:puppet_agent_version]) || 'pc1'
+
+          opts[:puppet_collection].downcase! # the collection names are case sensitive
 
           run_in_parallel = run_in_parallel? opts, @options, 'install'
           block_on hosts, { :run_in_parallel => run_in_parallel } do |host|
-            add_role(host, 'aio') #we are installing agent, so we want aio role
+            # AIO refers to FOSS agents that contain puppet 4+, that is, puppet-agent packages
+            # in the 1.x series, or the 5.x series, or later. Previous versions are not supported,
+            # so 'aio' is the only role that makes sense here.
+            add_role(host, 'aio')
             package_name = nil
+
+            # If inside the Puppet VPN, install from development builds.
+            if opts[:puppet_agent_version] && dev_builds_accessible_on?(host)
+              return install_puppet_agent_from_dev_builds_on(host, opts[:puppet_agent_version])
+            end
+
             case host['platform']
             when /el-|redhat|fedora|sles|centos|cisco_/
               package_name = 'puppet-agent'
@@ -1341,6 +1372,82 @@ module Beaker
           on host, "certutil -v -addstore Root C:\\Windows\\Temp\\#{cert_name}.pem"
         end
 
+        # Install puppetserver on the target host from released repos,
+        # nightlies, or Puppet's internal build servers.
+        #
+        # The default behavior is to install the latest release of puppetserver
+        # from the 'puppet' official repo.
+        #
+        # @param [Host] host A beaker host
+        # @option opts [String] :version Specific puppetserver version.
+        #     If set, this overrides all other options and installs the specific
+        #     version from Puppet's internal build servers.
+        # @option opts [Boolean] :nightlies Whether to install from nightlies.
+        #     Defaults to false.
+        # @option opts [String] :release_stream Which release stream to install
+        #     repos from. Defaults to 'puppet', which installs the latest released
+        #     version. Other valid values are puppet5, puppet6.
+        # @option opts [String] :nightly_builds_url Custom nightly builds URL.
+        #     Defaults to {DEFAULT_NIGHTLY_BUILDS_URL}.
+        # @option opts [String] :yum_nightly_builds_url Custom nightly builds
+        #     URL for yum. Defaults to {DEFAULT_NIGHTLY_BUILDS_URL}/yum when using
+        #     the default :nightly_builds_url value. Otherwise, defaults to
+        #     {DEFAULT_NIGHTLY_BUILDS_URL}.
+        # @option opts [String] :apt_nightly_builds_url Custom nightly builds
+        #     URL for apt. Defaults to {DEFAULT_NIGHTLY_BUILDS_URL}/apt when using
+        #     the default :nightly_builds_url value. Otherwise, defaults to
+        #     {DEFAULT_NIGHTLY_BUILDS_URL}.
+        # @option opts [String] :dev_builds_url Custom internal builds URL.
+        #     Defaults to {DEFAULT_DEV_BUILDS_URL}.
+        def install_puppetserver_on(host, opts = {})
+          # If the version is anything other than 'latest', install that specific version from internal dev builds
+          if opts[:version] && opts[:version].strip != 'latest'
+            dev_builds_url = opts[:dev_builds_url] || Puppet5::DEFAULT_DEV_BUILDS_URL
+            build_yaml_uri = %(#{dev_builds_url}/puppetserver/#{opts[:version]}/artifacts/#{opts[:version]}.yaml)
+            unless link_exists?(build_yaml_uri)
+              raise "Can't find a downloadable puppetserver package; metadata at #{build_yaml_uri} is missing or inaccessible."
+            end
+            return install_from_build_data_url('puppetserver', build_yaml_uri, host)
+          end
+
+          # Determine the release stream's name, for repo selection. The default
+          # is 'puppet', which installs the latest release. Other valid values
+          # are 'puppet5' or 'puppet6'.
+          release_stream = opts[:release_stream] || 'puppet'
+
+          # Installing a release repo will call configure_type_defaults_on,
+          # which will try and fail to add PE defaults by default. This is a
+          # FOSS install method, so we don't want that. Set the type to AIO,
+          # which refers to FOSS with puppet 4+ (note that a value of `:foss`
+          # here would be incorrect - that refers to FOSS puppet 3 only).
+          host[:type] = :aio
+
+          if opts[:nightlies]
+            release_stream += '-nightly'
+            # Determine the repo URLs; Use Puppet's nightly builds by default.
+            nightly_builds_url = opts[:nightly_builds_url] || DEFAULT_NIGHTLY_BUILDS_URL
+            if nightly_builds_url == DEFAULT_NIGHTLY_BUILDS_URL
+              # Puppet's nightlies need particular paths for these:
+              yum_nightly_builds_url = opts[:yum_nightly_builds_url] || nightly_builds_url + '/yum'
+              apt_nightly_builds_url = opts[:apt_nightly_builds_url] || nightly_builds_url + '/apt'
+            else
+              # If custom yum and apt urls are supplied, use them, otherwise
+              # just assume the nightly_builds_url is fine.
+              yum_nightly_builds_url = opts[:yum_nightly_builds_url] || nightly_builds_url
+              apt_nightly_builds_url = opts[:apt_nightly_builds_url] || nightly_builds_url
+            end
+            install_puppetlabs_release_repo_on(host, release_stream,
+                                               release_yum_repo_url: yum_nightly_builds_url,
+                                               release_apt_repo_url: apt_nightly_builds_url)
+          else
+            install_puppetlabs_release_repo_on(host, release_stream)
+          end
+
+          install_package(host, 'puppetserver')
+
+          logger.notify("Installed puppetserver version #{puppetserver_version_on(host)} on #{host}")
+        end
+
         # Ensures Puppet and dependencies are no longer installed on host(s).
         #
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,

data/lib/beaker-puppet/install_utils/puppet5.rb

@@ -4,9 +4,11 @@ module Beaker
   module DSL
     module InstallUtils
       module Puppet5
-
         include Beaker::DSL::InstallUtils::FOSSDefaults
 
+        # Base URL for internal Puppet Inc. builds
+        DEFAULT_DEV_BUILDS_URL = 'http://builds.delivery.puppetlabs.net'
+
         # grab build json from the builds server
         #
         # @param [String] sha_yaml_url URL to the <SHA>.yaml file containing the
@@ -183,8 +185,7 @@ module Beaker
         def install_from_build_data_url(project_name, sha_yaml_url, local_hosts = nil)
           if !link_exists?( sha_yaml_url )
             message = <<-EOF
-              <SHA>.yaml URL '#{ sha_yaml_url }' does not exist.
-              Please update the `sha_yaml_url` parameter to the `puppet5_install` method.
+              Unable to locate a downloadable build of #{project_name} (tried #{sha_yaml_url})
             EOF
             fail_test( message )
           end
@@ -205,6 +206,19 @@ module Beaker
           end
         end
 
+        # Install puppet-agent from an internal Puppet development build. This method only
+        # works inside Puppet's corporate VPN.
+        # @param [Host|Array<Host>] one_or_more_hosts to install the agent on
+        # @param [String] ref to install (this can be a tag or a long SHA)
+        def install_puppet_agent_from_dev_builds_on(one_or_more_hosts, ref)
+          block_on(one_or_more_hosts, run_in_parallel: true) do |host|
+            unless dev_builds_accessible_on?(host)
+              fail_test("Can't install puppet-agent #{ref}: unable to access Puppet's internal builds")
+            end
+          end
+          sha_yaml_url = File.join(DEFAULT_DEV_BUILDS_URL, 'puppet-agent', ref, 'artifacts', "#{ref}.yaml")
+          install_from_build_data_url('puppet-agent', sha_yaml_url, one_or_more_hosts)
+        end
       end
     end
   end

data/lib/beaker-puppet/install_utils/puppet_utils.rb

@@ -72,8 +72,11 @@ module Beaker
           end
         end
 
-        #Given an agent_version, return the puppet collection associated with that agent version
-        #@param [String] agent_version version string or 'latest'
+        # Given an agent_version, return the puppet collection associated with that agent version
+        #
+        # @param [String] agent_version version string or 'latest'
+        # @deprecated This method returns 'PC1' as the latest puppet collection;
+        #     this is incorrect. Use {#puppet_collection_for} instead.
         def get_puppet_collection(agent_version = 'latest')
           collection = "PC1"
           if agent_version != 'latest'
@@ -86,6 +89,67 @@ module Beaker
           collection
         end
 
+        # Determine the puppet collection that matches a given package version. The package
+        # must be one of
+        #   * :puppet_agent (you can get this version from the `aio_agent_version_fact`)
+        #   * :puppet
+        #
+        #
+        # @param package [Symbol] the package name. must be one of :puppet_agent, :puppet
+        # @param version [String] a version number or the string 'latest'
+        # @returns [String|nil] the name of the corresponding puppet collection, if any
+        def puppet_collection_for(package, version)
+          valid_packages = [
+            :puppet_agent,
+            :puppet
+          ]
+
+          unless valid_packages.include?(package)
+            raise "package must be one of #{valid_packages.join(', ')}"
+          end
+
+          case package
+          when :puppet_agent, :puppet
+            version = version.to_s
+            return 'puppet' if version.strip == 'latest'
+
+            x, y, z = version.to_s.split('.').map(&:to_i)
+            return nil if x.nil? || y.nil? || z.nil?
+
+            pc1_x = package == :puppet ? 4 : 1
+            return 'pc1' if x == pc1_x
+
+            # A y version >= 99 indicates a pre-release version of the next x release
+            x += 1 if y >= 99
+            "puppet#{x}" if x > 4
+          end
+        end
+
+        # Report the version of puppet-agent installed on `host`
+        #
+        # @param [Host] host The host to act upon
+        # @returns [String|nil] The version of puppet-agent, or nil if puppet-agent is not installed
+        def puppet_agent_version_on(host)
+          result = on(host, facter('aio_agent_version'), accept_all_exit_codes: true)
+          if result.exit_code.zero?
+            return result.stdout.strip
+          end
+          nil
+        end
+
+        # Report the version of puppetserver installed on `host`
+        #
+        # @param [Host] host The host to act upon
+        # @returns [String|nil] The version of puppetserver, or nil if puppetserver is not installed
+        def puppetserver_version_on(host)
+          result = on(host, 'puppetserver --version', accept_all_exit_codes: true)
+          if result.exit_code.zero?
+            matched = result.stdout.strip.scan(%r{\d+\.\d+\.\d+})
+            return matched.last
+          end
+          nil
+        end
+
         #Configure the provided hosts to be of the provided type (one of foss, aio, pe), if the host
         #is already associated with a type then remove the previous settings for that type
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
@@ -165,6 +229,29 @@ module Beaker
           end
         end
 
+        # Uses puppet to stop the firewall on the given hosts. Puppet must be installed before calling this method.
+        # @param [Host, Array<Host>, String, Symbol] hosts One or more hosts to act upon, or a role (String or Symbol) that identifies one or more hosts.
+        def stop_firewall_with_puppet_on(hosts)
+          block_on hosts do |host|
+            case host['platform']
+            when /debian/
+              result = on(host, 'which iptables', accept_all_exit_codes: true)
+              if result.exit_code == 0
+                on host, 'iptables -F'
+              else
+                logger.notify("Unable to locate `iptables` on #{host['platform']}; not attempting to clear firewall")
+              end
+            when /fedora|el-7/
+              on host, puppet('resource', 'service', 'firewalld', 'ensure=stopped')
+            when /el-|centos/
+              on host, puppet('resource', 'service', 'iptables', 'ensure=stopped')
+            when /ubuntu/
+              on host, puppet('resource', 'service', 'ufw', 'ensure=stopped')
+            else
+              logger.notify("Not sure how to clear firewall on #{host['platform']}")
+            end
+          end
+        end
       end
     end
   end

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.14.0'
+  VERSION = '1.15.0'
 end

data/setup/common/025_StopFirewall.rb

@@ -1,22 +1,4 @@
 test_name "Stop firewall" do
   skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
-  hosts.each do |host|
-    case host['platform']
-    when /debian/
-      result = on(host, 'which iptables', accept_all_exit_codes: true)
-      if result.exit_code == 0
-        on host, 'iptables -F'
-      else
-        logger.notify("Unable to locate `iptables` on #{host['platform']}; not attempting to clear firewall")
-      end
-    when /fedora|el-7/
-      on host, puppet('resource', 'service', 'firewalld', 'ensure=stopped')
-    when /el-|centos/
-      on host, puppet('resource', 'service', 'iptables', 'ensure=stopped')
-    when /ubuntu/
-      on host, puppet('resource', 'service', 'ufw', 'ensure=stopped')
-    else
-      logger.notify("Not sure how to clear firewall on #{host['platform']}")
-    end
-  end
+  stop_firewall_with_puppet_on(hosts)
 end

data/spec/beaker-puppet/install_utils/foss_utils_spec.rb

@@ -1444,6 +1444,93 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe '#install_puppetserver_on' do
+    let(:host) { make_host('master', platform: 'el-7-x86_64') }
+
+    context 'with default arguments' do
+      it "installs the latest puppetserver from the default 'puppet' release stream" do
+        expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet')
+        expect(subject).to receive(:install_package).with(host, 'puppetserver')
+        subject.install_puppetserver_on(host)
+      end
+    end
+
+    context 'with a version option' do
+      version = '6.6.6'
+
+      it 'installs puppetserver at the specific version from internal buildservers' do
+        expect(subject).to receive(:install_from_build_data_url).with('puppetserver', /^#{BeakerPuppet::DEFAULT_DEV_BUILDS_URL}.*#{version}/, host)
+        allow_any_instance_of(Beaker::DSL::WebHelpers).to receive(:link_exists?).and_return(true)
+        subject.install_puppetserver_on(host, version: version)
+      end
+
+      context "and a YAML metadata file isn't accessible for it" do
+        it 'raises an exception' do
+          allow_any_instance_of(Beaker::DSL::WebHelpers).to receive(:link_exists?).and_return(false)
+          expect { subject.install_puppetserver_on(host, version: version) }.to raise_error(RuntimeError)
+        end
+      end
+
+      context 'with a custom dev builds URL' do
+        dev_builds_url = 'http://builds.corp.tld'
+
+        it 'installs puppetserver from the custom dev builds URL' do
+          expect(subject).to receive(:install_from_build_data_url).with('puppetserver', /^#{dev_builds_url}.*#{version}/, host)
+          allow_any_instance_of(Beaker::DSL::WebHelpers).to receive(:link_exists?).and_return(true)
+          subject.install_puppetserver_on(host, version: version, dev_builds_url: dev_builds_url)
+        end
+      end
+    end
+
+    context 'with a custom release stream option' do
+      it 'installs puppetserver from the custom release stream' do
+        release_stream = 'puppet6'
+        expect(subject).to receive(:install_puppetlabs_release_repo_on)
+                               .with(host, release_stream)
+        expect(subject).to receive(:install_package).with(host, 'puppetserver')
+        subject.install_puppetserver_on(host, release_stream: release_stream)
+      end
+    end
+
+    context 'with the nightlies option' do
+      it 'installs puppetserver from the default puppet nightly repos' do
+        expect(subject).to receive(:install_puppetlabs_release_repo_on)
+                               .with(host, 'puppet-nightly',
+                                     release_yum_repo_url: "#{BeakerPuppet::DEFAULT_NIGHTLY_BUILDS_URL}/yum",
+                                     release_apt_repo_url: "#{BeakerPuppet::DEFAULT_NIGHTLY_BUILDS_URL}/apt")
+        subject.install_puppetserver_on(host, nightlies: true)
+      end
+
+      context 'with custom nightlies urls' do
+        custom_nightlies_url = 'http://nightlies.corp.tld'
+
+        it 'uses a custom general nightlies url' do
+          expect(subject).to receive(:install_puppetlabs_release_repo_on)
+                                 .with(host, 'puppet-nightly',
+                                       release_yum_repo_url: custom_nightlies_url,
+                                       release_apt_repo_url: custom_nightlies_url)
+          subject.install_puppetserver_on(host, nightlies: true, nightly_builds_url: custom_nightlies_url)
+        end
+
+        it 'uses a custom yum repo url' do
+          expect(subject).to receive(:install_puppetlabs_release_repo_on)
+                                 .with(host, 'puppet-nightly',
+                                       release_yum_repo_url: custom_nightlies_url,
+                                       release_apt_repo_url: "#{BeakerPuppet::DEFAULT_NIGHTLY_BUILDS_URL}/apt")
+          subject.install_puppetserver_on(host, nightlies: true, yum_nightly_builds_url: custom_nightlies_url)
+        end
+
+        it 'uses a custom apt repo url' do
+          expect(subject).to receive(:install_puppetlabs_release_repo_on)
+                                 .with(host, 'puppet-nightly',
+                                       release_yum_repo_url: "#{BeakerPuppet::DEFAULT_NIGHTLY_BUILDS_URL}/yum",
+                                       release_apt_repo_url: custom_nightlies_url)
+          subject.install_puppetserver_on(host, nightlies: true, apt_nightly_builds_url: custom_nightlies_url)
+        end
+      end
+    end
+  end
+
   describe '#remove_puppet_on' do
     supported_platforms   = [ 'aix-53-power',
                               'aix-61-power',

data/spec/beaker-puppet/install_utils/puppet5_spec.rb

@@ -368,10 +368,7 @@ describe ClassMixedWithDSLInstallUtils do
 
       expect {
         subject.install_from_build_data_url( 'project_name', sha_yaml_url )
-      }.to raise_error(
-        Beaker::DSL::Outcomes::FailTest,
-        /#{sha_yaml_url}' does not exist/
-      )
+      }.to raise_error(Beaker::DSL::Outcomes::FailTest, /project_name.*#{sha_yaml_url}/)
     end
 
     it 'runs host.install_package instead of #install_artifact_on if theres a repo_config' do
@@ -393,4 +390,23 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe '#install_puppet_agent_from_dev_builds_on' do
+    let(:host) { make_host('test_host', { platform: 'el-7-x86_64' }) }
+    let(:ref) { "sha" }
+    let(:sha_yaml_url) { "#{Beaker::DSL::Puppet5::DEFAULT_DEV_BUILDS_URL}/puppet-agent/#{ref}/artifacts/#{ref}.yaml" }
+
+    it 'installs puppet-agent from internal builds when they are accessible' do
+      expect( subject ).to receive(:block_on).with(anything, :run_in_parallel => true)
+      allow(subject).to receive(:dev_builds_accessible_on?).and_return(true)
+      allow(subject).to receive(:install_from_build_data_url).with('puppet-agent', sha_yaml_url, host)
+      subject.install_puppet_agent_from_dev_builds_on(host, ref)
+      expect(subject).to have_received(:install_from_build_data_url).with('puppet-agent', sha_yaml_url, host)
+    end
+
+    it 'fails the test when internal builds are inaccessible' do
+      expect( subject ).to receive(:block_on).with(anything, :run_in_parallel => true)
+      allow(subject).to receive(:dev_builds_accessible?).and_return(false)
+      expect { subject.install_puppet_agent_from_dev_builds_on(host, 'sha') }.to raise_error(Beaker::DSL::Outcomes::FailTest)
+    end
+  end
 end

data/spec/beaker-puppet/install_utils/puppet_utils_spec.rb

@@ -137,19 +137,71 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
-  describe "get_puppet_collection" do
-    it "receives agent_version 'latest' and return collection 'PC1'" do
-      expect(subject.get_puppet_collection('latest')).to eq('PC1')
+  describe '#puppet_collection_for' do
+    it 'raises an error when given an invalid package' do
+      expect { subject.puppet_collection_for(:foo, '5.5.4') }.to raise_error
     end
-    it "receives agent_version between 5.5.4 and 5.99 and return collection 'puppet5'" do
-      expect(subject.get_puppet_collection('5.5.4')).to eq('puppet5')
-    end
-    it "receives agent_version greater than 5.99 and return collection 'puppet6'" do
-      expect(subject.get_puppet_collection('6.0')).to eq('puppet6')
+
+    context 'when the :puppet_agent package is passed in' do
+      context 'given a valid version' do
+        {
+          '1.10.14'     => 'pc1',
+          '1.10.x'      => 'pc1',
+          '5.3.1'       => 'puppet5',
+          '5.3.x'       => 'puppet5',
+          '5.99.0'      => 'puppet6',
+          '6.1.99-foo'  => 'puppet6',
+          '6.99.99'     => 'puppet7',
+          '7.0.0'       => 'puppet7',
+        }.each do |version, collection|
+          it "returns collection '#{collection}' for version '#{version}'" do
+            expect(subject.puppet_collection_for(:puppet_agent, version)).to eq(collection)
+          end
+        end
+      end
+  
+      it "returns the default, latest puppet collection given the version 'latest'" do
+        expect(subject.puppet_collection_for(:puppet_agent, 'latest')).to eq('puppet')
+      end
+  
+      context 'given an invalid version' do
+        [nil, '', '0.1.0', '3.8.1', '', 'not-semver', 'not.semver.either'].each do |version|
+          it "returns a nil collection value for version '#{version}'" do
+            expect(subject.puppet_collection_for(:puppet_agent, version)).to be_nil
+          end
+        end
+      end
     end
-    it "receives agent_version less than 5.5.4 and return collection 'PC1'" do
-      expect(subject.get_puppet_collection('3.0')).to eq('PC1')
+
+    context 'when the :puppet package is passed-in' do
+      context 'given a valid version' do
+        {
+          '4.9.0'       => 'pc1',
+          '4.10.x'      => 'pc1',
+          '5.3.1'       => 'puppet5',
+          '5.3.x'       => 'puppet5',
+          '5.99.0'      => 'puppet6',
+          '6.1.99-foo'  => 'puppet6',
+          '6.99.99'     => 'puppet7',
+          '7.0.0'       => 'puppet7',
+        }.each do |version, collection|
+          it "returns collection '#{collection}' for version '#{version}'" do
+            expect(subject.puppet_collection_for(:puppet, version)).to eq(collection)
+          end
+        end
+      end
+
+      it "returns the default, latest puppet collection given the version 'latest'" do
+        expect(subject.puppet_collection_for(:puppet, 'latest')).to eq('puppet')
+      end
+
+      context 'given an invalid version' do
+        [nil, '', '0.1.0', '3.8.1', '', 'not-semver', 'not.semver.either'].each do |version|
+          it "returns a nil collection value for version '#{version}'" do
+            expect(subject.puppet_collection_for(:puppet, version)).to be_nil
+          end
+        end
+      end
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec