beaker-puppet 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59253ab3e53433cc50aa11fce2564472db5e2293
-  data.tar.gz: df4b8cecf947cb8bd9681ca6cd2ece5225a6882c
+  metadata.gz: e36de0d3a26174df84e75c1aac59079ea1d29460
+  data.tar.gz: 4a9fc4ae22a19955d01a3ae73900dd9a634aa737
 SHA512:
-  metadata.gz: 53bc876e2ac0677b22c564b163affc710c23b5ce27907e26354eaaa2d9c71b9f93dd9306a946b92d41de952f878985e6bb6a9618c6fe98326f626f3a93acbbbb
-  data.tar.gz: 2828b53c02ca4c9111d06581c370e34dd985e0cd0080004be9e4f163f8d90b3d75758593c411f42c67d7811e4652de1e3ed9110b88777f8c313b6324a18a8711
+  metadata.gz: 441d745d701b6f5012d8f83e4c347efbb32da3e0aff93fa479d64a0f0598a0e4051f8f945a7d98110eb01bbc54ad23db26e9d1c48bd6486ca64742ec460ea70a
+  data.tar.gz: 7f2f7b46616579a86970ec13a727e9b472a33435e9e13d9de6e9d5f508ab881746d7ca24045c089585bb259a089b7e716df5073728f2651cc4fc4dc741fc988f

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

@@ -13,6 +13,7 @@ module Beaker
           :pe_promoted_builds_url   => "http://pm.puppet.com",
           :release_apt_repo_url     => "http://apt.puppet.com",
           :release_yum_repo_url     => "http://yum.puppet.com",
+          :nightly_builds_url       => "http://nightlies.puppet.com",
           :nightly_apt_repo_url     => "http://nightlies.puppet.com/apt",
           :nightly_yum_repo_url     => "http://nightlies.puppet.com/yum",
           :nightly_win_download_url => "http://nightlies.puppet.com/downloads/windows",

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

@@ -31,8 +31,22 @@ 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'
+        # Merge given options with our default options in a consistent way
+        # This will remove any nil values so that we always have a set default.
+        #
+        # @param [Hash] the original options to be merged with the default options
+        #
+        # @return [Hash] The finalized set of options
+        def sanatize_opts(opts)
+          # If any of the nightly urls are not set, but the main `:nightly_builds_url`
+          # is set, we should overwrite anything not set.
+          opts[:nightly_apt_repo_url]     ||= opts[:nightly_builds_url]
+          opts[:nightly_yum_repo_url]     ||= opts[:nightly_builds_url]
+          opts[:nightly_win_download_url] ||= opts[:nightly_builds_url]
+          opts[:nightly_mac_download_url] ||= opts[:nightly_builds_url]
+
+          FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts.reject{|k,v| v.nil?})
+        end
 
         # lookup project-specific git environment variables
         # PROJECT_VAR or VAR otherwise return the default
@@ -45,17 +59,17 @@ module Beaker
         end
 
         # @return [Boolean] Whether Puppet's internal builds are accessible from all the SUTs
-        def dev_builds_accessible?
+        def dev_builds_accessible?(url = FOSS_DEFAULT_DOWNLOAD_URLS[:dev_builds_url])
           block_on hosts do |host|
-            return false unless dev_builds_accessible_on?(host)
+            return false unless dev_builds_accessible_on?(host, url)
           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)
+        def dev_builds_accessible_on?(host, url = FOSS_DEFAULT_DOWNLOAD_URLS[:dev_builds_url])
+          result = on(host, %(curl -fI "#{url}"), accept_all_exit_codes: true)
           return result.exit_code.zero?
         end
 
@@ -271,7 +285,7 @@ module Beaker
         # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
         # @raise [FailTest] When error occurs during the actual installation process
         def install_puppet_on(hosts, opts = options)
-          opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
+          opts = sanatize_opts(opts)
 
           # If version isn't specified assume the latest in the 3.x series
           if opts[:version] and not version_is_less(opts[:version], '4.0.0')
@@ -358,7 +372,7 @@ module Beaker
         # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
         # @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 = sanatize_opts(opts)
           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'
 
@@ -374,10 +388,21 @@ module Beaker
             package_name = nil
 
             # If inside the Puppet VPN, install from development builds.
-            if opts[:puppet_agent_version] && dev_builds_accessible_on?(host)
+            if opts[:puppet_agent_version] && opts[:puppet_agent_version] != 'latest' && dev_builds_accessible_on?(host, opts[:dev_builds_url])
               return install_puppet_agent_from_dev_builds_on(host, opts[:puppet_agent_version])
             end
 
+            if opts[:puppet_agent_version] == 'latest'
+              opts[:puppet_collection] += '-nightly' unless opts[:puppet_collection].end_with? '-nightly'
+
+              # Since we have modified the collection, we don't want to pass `latest`
+              # in to `install_package` as the version. That'll fail. Instead, if
+              # we pass `nil`, `install_package` will just install the latest available
+              # package version from the enabled repo.
+              opts.delete(:puppet_agent_version)
+              opts.delete(:version)
+            end
+
             case host['platform']
             when /el-|redhat|fedora|sles|centos|cisco_/
               package_name = 'puppet-agent'
@@ -969,8 +994,8 @@ module Beaker
         def install_puppetlabs_release_repo_on( hosts, repo = nil, opts = options )
           block_on hosts do |host|
             variant, version, arch, codename = host['platform'].to_array
-            repo_name = repo || opts[:puppet_collection] || ''
-            opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
+            repo_name = repo || opts[:puppet_collection] || 'puppet'
+            opts = sanatize_opts(opts)
 
             case variant
             when /^(fedora|el|redhat|centos|sles|cisco_nexus|cisco_ios_xr)$/
@@ -989,11 +1014,10 @@ module Beaker
                       else
                         opts[:release_yum_repo_url]
                       end
-                remote = "%s/%s/%s-release-%s-%s.noarch.rpm" %
-                  [url, repo_name, repo_name, variant_url_value, version]
+                remote = "%s/%s-release-%s-%s.noarch.rpm" %
+                  [url, repo_name, variant_url_value, version]
               else
-                repo_name = '-' + repo_name unless repo_name.empty?
-                remote = "%s/puppetlabs-release%s-%s-%s.noarch.rpm" %
+                remote = "%s/%s-release-%s-%s.noarch.rpm" %
                   [opts[:release_yum_repo_url], repo_name, variant_url_value, version]
               end
 
@@ -1029,8 +1053,7 @@ module Beaker
                 remote = "%s/%s-release-%s.deb" %
                   [url, repo_name, codename]
               else
-                repo_name = '-' + repo_name unless repo_name.empty?
-                remote = "%s/puppetlabs-release%s-%s.deb" %
+                remote = "%s/%s-release-%s.deb" %
                   [opts[:release_apt_repo_url], repo_name, codename]
               end
 
@@ -1130,7 +1153,7 @@ module Beaker
           repo_configs_dir ||= 'tmp/repo_configs'
 
           platform_configs_dir = File.join(repo_configs_dir, variant)
-          opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
+          opts = sanatize_opts(opts)
 
           # some of the uses of dev_builds_url below can't include protocol info,
           # plus this opens up possibility of switching the behavior on provided
@@ -1224,7 +1247,7 @@ module Beaker
             # you could provide any values you could to one to the other
             puppet_agent_version = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
 
-            opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
+            opts = sanatize_opts(opts)
             opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{ puppet_agent_version }/repos/"
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:puppet_collection]  ||= 'PC1'
@@ -1323,7 +1346,7 @@ module Beaker
 
           block_on hosts do |host|
             pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0.0-rc1'
-            opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
+            opts = sanatize_opts(opts)
             opts[:download_url] = "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{ pe_ver }/#{ opts[:puppet_agent_version] }/repos"
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= host.external_copy_base
@@ -1383,32 +1406,33 @@ module Beaker
         # @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.
+        #     version from Puppet's internal build servers or Puppet's public
+        #     release servers. If this version of puppetserver does not exist,
+        #     the install attempt will fail.
         # @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}.
+        #     Defaults to {FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_builds_url]}.
+        # @option opts [String] :nightly_yum_builds_url Custom nightly builds
+        #     URL for yum. Defaults to {FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_yum_repo_url]}
+        #     or a custom defined :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}.
+        #     URL for apt. Defaults to {FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_builds_url]}
+        #     or a custom defined :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
+          opts = sanatize_opts(opts)
+
+          # Default to installing latest from nightlies
+          opts[:version] ||= 'latest'
+
+          # If inside the Puppet VPN, install from development builds.
+          if opts[:version] && opts[:version] != 'latest' && dev_builds_accessible_on?(host, opts[:dev_builds_url])
+            build_yaml_uri = %(#{opts[:dev_builds_url]}/puppetserver/#{opts[:version]}/artifacts/#{opts[:version]}.yaml)
             return install_from_build_data_url('puppetserver', build_yaml_uri, host)
           end
 
@@ -1424,28 +1448,24 @@ module Beaker
           # 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)
+          if opts[:version] == 'latest' || opts[:nightlies]
+            release_stream += '-nightly' unless release_stream.end_with? "-nightly"
+
+            # Since we have modified the collection, we don't want to pass `latest`
+            # in to `install_package` as the version. That'll fail. Instead, if
+            # we pass `nil`, `install_package` will just install the latest available
+            # package version from the enabled repo.
+            opts.delete(:version)
+          end
+
+          # We have to do some silly version munging if we're on a deb-based platform
+          case host['platform']
+          when /debian|ubuntu|cumulus|huaweios/
+            opts[:version] = "#{opts[:version]}-1#{host['platform'].codename}" if opts[:version]
           end
 
-          install_package(host, 'puppetserver')
+          install_puppetlabs_release_repo_on(host, release_stream, opts)
+          install_package(host, 'puppetserver', opts[:version])
 
           logger.notify("Installed puppetserver version #{puppetserver_version_on(host)} on #{host}")
         end

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.17.0'
+  VERSION = '1.18.0'
 end

data/setup/aio/010_Install_Puppet_Agent.rb

@@ -1,24 +1,13 @@
-test_name "Install Packages" do
+test_name "Install Puppet Agent Packages" do
 
-  dev_builds_url  = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
-  nightly_builds_url = ENV['NIGHTLY_BUILDS_URL'] || 'http://nightlies.puppet.com'
+  opts = {
+    :nightly_builds_url => ENV['NIGHTLY_BUILDS_URL'],
+    :dev_builds_url => ENV['DEV_BUILDS_URL'],
+    :puppet_agent_version => ENV['SHA'],
+    :puppet_collection => ENV['RELEASE_STREAM']
+  }
 
-  sha = ENV['SHA']
-  release_stream = ENV['RELEASE_STREAM'] || 'puppet'
-
-  step "Install puppet-agent..." do
-    # If SHA='latest', then we're installing from nightlies
-    if sha == 'latest'
-      opts = {
-        :release_yum_repo_url => nightly_builds_url + '/yum',
-        :release_apt_repo_url => nightly_builds_url + '/apt',
-        :puppet_collection => "#{release_stream}-nightly"
-      }
-      install_puppet_agent_on(hosts, opts)
-    else
-      install_from_build_data_url('puppet-agent', "#{dev_builds_url}/puppet-agent/#{sha}/artifacts/#{sha}.yaml", hosts)
-    end
-  end
+  install_puppet_agent_on(hosts, opts)
 
   # make sure install is sane, beaker has already added puppet and ruby
   # to PATH in ~/.ssh/environment

data/setup/common/011_Install_Puppet_Server.rb

@@ -1,27 +1,11 @@
 test_name "Install Puppet Server" do
   skip_test "not testing with puppetserver" unless @options['is_puppetserver']
 
-  server_version = ENV['SERVER_VERSION'] || 'latest'
-  release_stream = ENV['RELEASE_STREAM'] || 'puppet'
-  nightly_builds_url = ENV['NIGHTLY_BUILDS_URL'] || 'http://nightlies.puppet.com'
-  dev_builds_url  = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
-
-  if nightly_builds_url == 'http://nightlies.puppet.com'
-    yum_nightlies_url = nightly_builds_url + '/yum'
-    apt_nightlies_url = nightly_builds_url + '/apt'
-  else
-    yum_nightlies_url = nightly_builds_url
-    apt_nightlies_url = nightly_builds_url
-  end
-
-  if server_version == 'latest'
-    opts = {
-      :release_yum_repo_url => yum_nightlies_url,
-      :release_apt_repo_url => apt_nightlies_url
-    }
-    install_puppetlabs_release_repo_on(master, "#{release_stream}-nightly", opts)
-    master.install_package('puppetserver')
-  else
-    install_from_build_data_url('puppetserver', "#{dev_builds_url}/puppetserver/#{server_version}/artifacts/#{server_version}.yaml", master)
-  end
+  opts = {
+    :version => ENV['SERVER_VERSION'],
+    :release_stream => ENV['RELEASE_STREAM'],
+    :nightly_builds_url => ENV['NIGHTLY_BUILDS_URL'],
+    :dev_builds_url => ENV['DEV_BUILDS_URL']
+  }
+  install_puppetserver_on(master, opts)
 end

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

@@ -71,6 +71,34 @@ describe ClassMixedWithDSLInstallUtils do
 
   let(:win_temp)      { 'C:\\Windows\\Temp' }
 
+  context '#sanatize_opts' do
+    let(:opts) {
+      {
+        :win_download_url => nil,
+        :dev_builds_url => '',
+        :release_yum_repo_url => 'https://apt.customserver.net/apt'
+      }
+    }
+
+    it 'honors any custom values' do
+      expect( subject.sanatize_opts(opts)).to include({release_yum_repo_url: 'https://apt.customserver.net/apt'})
+    end
+
+    it 'overwrites any nil values with pre-defined defaults' do
+      default_win_url = described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:win_download_url]
+      expect( subject.sanatize_opts(opts)).to include({win_download_url: default_win_url})
+    end
+
+    it 'keeps empty strings' do
+      expect( subject.sanatize_opts(opts)).to include({dev_builds_url: ''})
+    end
+
+    it 'adds any undefined defaults' do
+      default_mac_url = described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:mac_download_url]
+      expect( subject.sanatize_opts(opts)).to include({mac_download_url: default_mac_url})
+    end
+  end
+
 
   context '#configure_foss_defaults_on' do
     it 'uses aio paths for hosts with role aio' do
@@ -455,7 +483,7 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on el-6' do
       let(:platform) { Beaker::Platform.new('el-6-i386') }
       it 'installs' do
-        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppetlabs-release-el-6\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppet-release-el-6\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
@@ -463,7 +491,7 @@ describe ClassMixedWithDSLInstallUtils do
         InParallel::InParallelExecutor.logger = logger
         FakeFS.deactivate!
         hosts.each{ |host|
-          allow(host).to receive(:install_package_with_rpm).with(/puppetlabs-release-el-6\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
+          allow(host).to receive(:install_package_with_rpm).with(/puppet-release-el-6\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
           allow(host).to receive(:install_package).with('puppet')
         }
         opts[:run_in_parallel] = true
@@ -485,7 +513,7 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on el-5' do
       let(:platform) { Beaker::Platform.new('el-5-i386') }
       it 'installs' do
-        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppetlabs-release-el-5\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(%r{puppet-release-el-5.noarch.rpm}, '--replacepkgs', {:package_proxy=>false})
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
@@ -493,7 +521,7 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on fedora' do
       let(:platform) { Beaker::Platform.new('fedora-18-x86_84') }
       it 'installs' do
-        expect(hosts[0]).to receive(:install_package_with_rpm).with(/puppetlabs-release-fedora-18\.noarch\.rpm/, '--replacepkgs', {:package_proxy=>false})
+        expect(hosts[0]).to receive(:install_package_with_rpm).with(%r{puppet-release-fedora-18.noarch.rpm}, '--replacepkgs', {:package_proxy=>false})
         expect(hosts[0]).to receive(:install_package).with('puppet')
         subject.install_puppet
       end
@@ -697,21 +725,17 @@ describe ClassMixedWithDSLInstallUtils do
     context 'on el 7' do
       let( :platform ) { Beaker::Platform.new( 'el-7-x86_64' ) }
       it 'returns the correct url when repo is set to puppet8' do
-        expect( host ).to receive( :install_package_with_rpm ).with( /puppet8\/puppet8-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
+        expect( host ).to receive( :install_package_with_rpm ).with( /puppet8-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
         subject.install_puppetlabs_release_repo_on( host, 'puppet8')
       end
       it 'returns the correct url when opts[:puppet_collection] is set to puppet14' do
-        expect( host ).to receive( :install_package_with_rpm ).with( /puppet14\/puppet14-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
+        expect( host ).to receive( :install_package_with_rpm ).with( /puppet14-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
         subject.install_puppetlabs_release_repo_on( host, nil, {:puppet_collection => 'puppet14'})
       end
       it 'returns the correct url when both repo and opts[:puppet_collection] are nil' do
-        expect( host ).to receive( :install_package_with_rpm ).with( /puppetlabs-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
+        expect( host ).to receive( :install_package_with_rpm ).with( /puppet-release-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
         subject.install_puppetlabs_release_repo_on( host )
       end
-      it 'returns the correct url when repo is set to pc1' do
-        expect( host ).to receive( :install_package_with_rpm ).with( /puppetlabs-release-pc1-el-7\.noarch\.rpm$/, '--replacepkgs', {:package_proxy=>false} )
-        subject.install_puppetlabs_release_repo_on( host, 'pc1' )
-      end
     end
 
     context 'on debian 8' do
@@ -729,17 +753,11 @@ describe ClassMixedWithDSLInstallUtils do
         subject.install_puppetlabs_release_repo_on( host, nil, {:puppet_collection => 'puppet7'} )
       end
       it 'returns the correct url when both repo and opts[:puppet_collection] are nil' do
-        expect( subject ).to receive( :on ).with( host, /puppetlabs-release-jessie\.deb$/ ).once
+        expect( subject ).to receive( :on ).with( host, /puppet-release-jessie\.deb$/ ).once
         expect( subject ).to receive( :on ).with( host, "dpkg -i --force-all /tmp/puppet.deb" ).once
         expect( subject ).to receive( :on ).with( host, "apt-get update" ).once
         subject.install_puppetlabs_release_repo_on( host )
       end
-      it 'returns the correct url when both repo is set to pc1' do
-        expect( subject ).to receive( :on ).with( host, /puppetlabs-release-pc1-jessie\.deb$/ ).once
-        expect( subject ).to receive( :on ).with( host, "dpkg -i --force-all /tmp/puppet.deb" ).once
-        expect( subject ).to receive( :on ).with( host, "apt-get update" ).once
-        subject.install_puppetlabs_release_repo_on( host, 'pc1' )
-      end
     end
 
 
@@ -1448,9 +1466,9 @@ describe ClassMixedWithDSLInstallUtils 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')
+      it "installs the latest puppetserver from the default 'puppet-nightly' release stream" do
+        expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet-nightly', include(nightly_yum_repo_url: "http://nightlies.puppet.com/yum"))
+        expect(subject).to receive(:install_package).with(host, 'puppetserver', nil)
         subject.install_puppetserver_on(host)
       end
     end
@@ -1458,46 +1476,61 @@ describe ClassMixedWithDSLInstallUtils do
     context 'with a version option' do
       version = '6.6.6'
 
+      context 'on deb-based platform' do
+        let(:host) {make_host('master', platform: Beaker::Platform.new('ubuntu-16.04-amd64'))}
+        it 'munges the version on ubuntu 16.04' do
+          expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet', anything)
+          expect(subject).to receive(:install_package).with(host, 'puppetserver', "#{version}-1xenial")
+          allow(subject).to receive(:dev_builds_accessible_on?).with(host, anything).and_return false
+          subject.install_puppetserver_on(host, version: version)
+        end
+      end
+
       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)
+        expect(subject).to receive(:install_from_build_data_url).with('puppetserver', /^#{described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:dev_builds_url]}.*#{version}/, host)
+        allow(subject).to receive(:dev_builds_accessible_on?).with(host, anything).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
+      it 'installs puppetserver from the custom dev builds URL' do
+        dev_builds_url = 'http://builds.corp.tld'
+        expect(subject).to receive(:install_from_build_data_url).with('puppetserver', /^#{dev_builds_url}.*#{version}/, host)
+        allow(subject).to receive(:dev_builds_accessible_on?).with(host, anything).and_return true
+        subject.install_puppetserver_on(host, version: version, dev_builds_url: dev_builds_url)
       end
 
-      context 'with a custom dev builds URL' do
+      it 'installs puppetserver from the main repo if a broken url is passed in' 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
+        allow(subject).to receive(:dev_builds_accessible_on?).with(host, dev_builds_url).and_return false
+        expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet', include(version: '6.6.6'))
+        expect(subject).to receive(:install_package).with(host, 'puppetserver', '6.6.6')
+        subject.install_puppetserver_on(host, version: version, dev_builds_url: dev_builds_url)
       end
-    end
 
-    context 'with a custom release stream option' do
-      it 'installs puppetserver from the custom release stream' do
+      it 'installs from a 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)
+        allow(subject).to receive(:dev_builds_accessible_on?).with(host, anything).and_return false
+        expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host,
+                                                                             release_stream,
+                                                                             include(version: '6.6.6'))
+        expect(subject).to receive(:install_package).with(host, 'puppetserver', '6.6.6')
+        subject.install_puppetserver_on(host, release_stream: release_stream, version: version)
+      end
+
+      it 'installs puppetserver from the default release stream' do
+        allow(subject).to receive(:dev_builds_accessible_on?).with(host, anything).and_return false
+        expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet', include(version: '6.6.6'))
+        expect(subject).to receive(:install_package).with(host, 'puppetserver', '6.6.6')
+        subject.install_puppetserver_on(host, version: version)
       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")
+                               .with(host, 'puppet-nightly', include(
+                                     nightly_yum_repo_url: described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_yum_repo_url],
+                                     nightly_apt_repo_url: described_class::FOSS_DEFAULT_DOWNLOAD_URLS[:nightly_apt_repo_url]))
         subject.install_puppetserver_on(host, nightlies: true)
       end
 
@@ -1506,26 +1539,24 @@ describe ClassMixedWithDSLInstallUtils do
 
         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)
+                                 .with(host, 'puppet-nightly', include(
+                                       nightly_yum_repo_url: custom_nightlies_url,
+                                       nightly_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)
+                                 .with(host, 'puppet-nightly', include(
+                                       nightly_yum_repo_url: custom_nightlies_url))
+          subject.install_puppetserver_on(host, nightlies: true, nightly_yum_repo_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)
+                                 .with(host, 'puppet-nightly', include(
+                                       nightly_apt_repo_url: custom_nightlies_url))
+          subject.install_puppetserver_on(host, nightlies: true, nightly_apt_repo_url: custom_nightlies_url)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec