packaging 0.99.71 → 0.99.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc55afd9bcd5d03c49cd0ce6f89ae31a209356058fb3462bafc8c65fe49d4797
-  data.tar.gz: 502621e9b2c3596626e56e0a38855ced2b118bcf501dc8a87381fda4f1c06f76
+  metadata.gz: 0d737ac46704906a2bc986128797b3db649dd3e35e1432f2a98f362da67ffa56
+  data.tar.gz: 7a1ae857ec7a92940499a60c9d649f5e5e40fd8f2340aa95d2751f0de29d9fbd
 SHA512:
-  metadata.gz: cb7d531d46d326390769e3c1f27210b3ae65907d9e48adae43248a13b850b5688e008f4d229267d0d936b8d80c6b0c8569b5823e41c55d60ed0145d4b47a9ec6
-  data.tar.gz: 5c9c2ee3f31fdfc657efb40e17ff9f5283707a883cc1c2bea3ec81dafed9da39a56ae58d6e791f657759ae419c96cfb726a1a30332dba174ab36a6087c50d4a7
+  metadata.gz: cacbbdc7c63c443a6a6bb6c0bc7f77367343b22b8356c4d99c00fe67a1fd448af0c7e0647d616ec533d1cb1cdfb6412fbff953bfb6926dbb4a06911d08da20df
+  data.tar.gz: 39ada32cc8dde4df7d661d00807ba937667338278191391ec534c98423228c594a49e2c74bedd10e9c8bd18601dae6bdff54804d48f2e255bc995b198bef4c13

data/README.md

@@ -404,7 +404,7 @@ deb_build_mirrors:
 # Who is packaging. Turns up in various packaging artifacts
 packager: 'puppetlabs'
 # GPG key ID of the signer
-gpg_key: '7F438280EF8D349F'
+gpg_key: '4528B6CD9E61EF26'
 # Whether to require tarball signing as a prerequisite of other package building
 sign_tar: false
 # a space separated list of mock configs. These are the rpm distributions to package for. If a noarch package, only one arch of each is needed.

data/lib/packaging/config.rb

@@ -6,6 +6,7 @@ module Pkg
   #
   class Config
     require 'packaging/config/params.rb'
+    require 'packaging/config/validations.rb'
     require 'yaml'
 
     class << self
@@ -389,6 +390,31 @@ module Pkg
         end
       end
 
+      ##
+      #   Ask for validation of BUILD_PARAMS
+      #
+      #   Issued as warnings initially but the intent is to turn this into
+      #   a failure.
+      #
+      def perform_validations
+        error_count = 0
+        Pkg::Params::VALIDATIONS.each do |v|
+          variable_name = v[:var]
+          variable_value = self.instance_variable_get("@#{v[:var]}")
+          validations = v[:validations]
+          validations.each do |validation|
+            unless Pkg::ConfigValidations.send(validation, variable_value)
+              warn "Warning: variable \"#{variable_name}\" failed validation \"#{validation}\""
+              error_count += 1
+            end
+          end
+        end
+
+        if error_count != 0
+          warn "Warning: #{error_count} validation failure(s)."
+        end
+      end
+
       def string_to_array(str)
         delimiters = /[,\s;]/
         return str if str.respond_to?('each')

data/lib/packaging/config/params.rb

@@ -298,6 +298,7 @@ module Pkg::Params
               { :var => :team,                    :envvar => :TEAM },
               { :var => :update_version_file,     :envvar => :NEW_STYLE_PACKAGE },
               { :var => :vanagon_project,         :envvar => :VANAGON_PROJECT, :type => :bool },
+              { :var => :version,                 :envvar => :PACKAGING_PACKAGE_VERSION },
               { :var => :yum_archive_path,        :envvar => :YUM_ARCHIVE_PATH },
               { :var => :yum_host,                :envvar => :YUM_HOST },
               { :var => :yum_repo_path,           :envvar => :YUM_REPO },
@@ -362,6 +363,7 @@ module Pkg::Params
                     { :oldvar => :yum_host,               :newvar => :tar_host },
                  ]
 
+
   # These are variables that we have deprecated. If they are encountered in a
   # project's config, we issue deprecations for them.
   #
@@ -372,4 +374,14 @@ module Pkg::Params
                   { :var => :gpg_name, :message => "
     DEPRECATED, 29-Jul-2014: 'gpg_name' has been replaced with 'gpg_key'.
                    Please update this field in your build_defaults.yaml" }]
+
+  # Provide an open-ended template for validating BUILD_PARAMS.
+  #
+  # Each validatation contains the variable name as ':var' and a list of validations it
+  # must pass from the Pkg::Params::Validations class.
+  #
+  VALIDATIONS = [
+    { :var => :project, :validations => [:not_empty?] }
+  ]
+
 end

data/lib/packaging/config/validations.rb

@@ -0,0 +1,13 @@
+module Pkg
+  class ConfigValidations
+
+    class << self
+
+      # As a validation, this one is kindof lame but is intended as a seed pattern for possibly
+      # more robust ones.
+      def not_empty?(value)
+        value.to_s.empty? ? false : true
+      end
+    end
+  end
+end

data/lib/packaging/gem.rb

@@ -1,9 +1,6 @@
 require 'json'
 module Pkg::Gem
   class << self
-    # This is preserved because I don't want to update the deprecated code path
-    # yet; I'm not entirely sure I've fixed everything that might attempt
-    # to call this method so this is now a wrapper for a wrapper.
     def ship(file)
       rsync_to_downloads(file)
       ship_to_rubygems(file)
@@ -13,17 +10,21 @@ module Pkg::Gem
     # checksums, or other glob-able artifacts to an external download server.
     def rsync_to_downloads(file)
       Pkg::Util.deprecate('Pkg::Gem.rsync_to_downloads', 'Pkg::Util::Ship.ship_pkgs')
-      Pkg::Util::Ship.ship_pkgs(["#{file}*"], Pkg::Config.gem_host, Pkg::Config.gem_path, platform_independent: true)
+      Pkg::Util::Ship.ship_pkgs(["#{file}*"], Pkg::Config.gem_host,
+                                Pkg::Config.gem_path, platform_independent: true)
     end
 
     def shipped_to_rubygems?(gem_name, gem_version, gem_platform)
-      gem_data = JSON.parse(`curl https://rubygems.org/api/v1/versions/#{gem_name}.json`)
-      gem = gem_data.select { |data| data['number'] == gem_version && data['platform'] == gem_platform }
+      rubygems_url = "https://rubygems.org/api/v1/versions/#{gem_name}.json"
+      gem_data = JSON.parse(%x(curl --silent #{rubygems_url}))
+      gem = gem_data.select do |data|
+        data['number'] == gem_version && data['platform'] == gem_platform
+      end
       return !gem.empty?
     rescue => e
-      puts "Uh oh, something went wrong searching for gem '#{gem_name}':"
+      puts "Something went wrong searching for gem '#{gem_name}':"
       puts e
-      puts "Perhaps you're shipping gem '#{gem_name}' for the first time? Congrats!"
+      puts "Perhaps you're shipping '#{gem_name}' for the first time?"
       return false
     end
 
@@ -40,7 +41,7 @@ module Pkg::Gem
       gem_platform ||= 'ruby'
 
       if shipped_to_rubygems?(Pkg::Config.gem_name, Pkg::Config.gemversion, gem_platform)
-        puts "#{file} has already been shipped to rubygems, skipping . . ."
+        puts "#{file} has already been shipped to rubygems, skipping."
         return
       end
       Pkg::Util::File.file_exists?("#{ENV['HOME']}/.gem/credentials", :required => true)
@@ -60,7 +61,10 @@ module Pkg::Gem
 
     def ship_to_internal_mirror(file)
       internal_mirror_api_key_name = 'artifactory_api_key'
-      ship_to_rubygems(file, { :host => Pkg::Config.internal_gem_host, :key => internal_mirror_api_key_name })
+      ship_to_rubygems(file, {
+                         host: Pkg::Config.internal_gem_host,
+                         key: internal_mirror_api_key_name
+                       })
     end
   end
 end

data/lib/packaging/paths.rb

@@ -16,9 +16,9 @@ module Pkg::Paths
     if source_formats.find { |fmt| path =~ /#{fmt}$/ }
       return Pkg::Platforms.get_attribute_for_platform_version(platform, version, :source_architecture)
     end
-    arches.find { |a| path.include?(a) } || arches[0]
+    arches.find { |a| path.include?(package_arch(platform, a)) } || arches[0]
   rescue
-    arches.find { |a| path.include?(a) } || arches[0]
+    arches.find { |a| path.include?(package_arch(platform, a)) } || arches[0]
   end
 
   # Given a path to an artifact, divine the appropriate platform tag associated
@@ -109,9 +109,19 @@ module Pkg::Paths
     platform_name = path_data[:platform_name]
     platform_tag = path_data[:platform_tag]
 
+    repo_name = Pkg::Config.repo_name
+
     case package_format
     when 'deb'
       debian_code_name = Pkg::Platforms.get_attribute(platform_tag, :codename)
+
+      # In puppet7 and beyond, we moved the repo_name to the top to allow each
+      # puppet major release to have its own apt repo.
+      if %w(FUTURE-puppet7 FUTURE-puppet7-nightly).include? repo_name
+        return File.join(prefix, apt_repo_name(is_nonfinal), debian_code_name)
+      end
+
+      # For puppet6 and prior
       return File.join(prefix, debian_code_name, apt_repo_name(is_nonfinal))
     when 'dmg'
       return File.join(prefix, 'mac', repo_name(is_nonfinal))
@@ -292,23 +302,47 @@ module Pkg::Paths
 
   # This is where deb packages end up after freight repo updates
   def apt_package_base_path(platform_tag, repo_name, project, nonfinal = false)
-    fail "Can't determine path for non-debian platform #{platform_tag}." unless Pkg::Platforms.package_format_for_tag(platform_tag) == 'deb'
+    unless Pkg::Platforms.package_format_for_tag(platform_tag) == 'deb'
+      fail "Can't determine path for non-debian platform #{platform_tag}."
+    end
+
     platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
-    codename = Pkg::Platforms.codename_for_platform_version(platform, version)
-    return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), 'pool', codename, repo_name, project[0], project)
+    code_name = Pkg::Platforms.codename_for_platform_version(platform, version)
+    remote_repo_path = remote_repo_base(platform_tag, nonfinal: nonfinal)
+
+    # In puppet7 and beyond, we moved the puppet major version to near the top to allow each
+    # puppet major release to have its own apt repo, for example:
+    # /opt/repository/apt/puppet7/pool/bionic/p/puppet-agent
+    if %w(FUTURE-puppet7 FUTURE-puppet7-nightly).include? repo_name
+      return File.join(remote_repo_path, repo_name, 'pool', code_name, project[0], project)
+    end
+
+    # For repos prior to puppet7, the puppet version was part of the repository
+    # For example: /opt/repository/apt/pool/bionic/puppet6/p/puppet-agent
+    if %w(puppet7 puppet7-nightly
+          puppet6 puppet6-nightly
+          puppet5 puppet5-nightly
+          puppet  puppet-nightly
+          puppet-tools).include? repo_name
+      return File.join(remote_repo_path, 'pool', code_name, repo_name, project[0], project)
+    end
+
+    raise "Error: Cannot determine apt_package_base_path for repo: \"#{repo_name}\"."
   end
 
   def release_package_link_path(platform_tag, nonfinal = false)
-    platform, version, arch = Pkg::Platforms.parse_platform_tag(platform_tag)
+    platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
     package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
     case package_format
     when 'rpm'
-      return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), "#{repo_name(nonfinal)}-release-#{platform}-#{version}.noarch.rpm")
+      return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal),
+                       "#{repo_name(nonfinal)}-release-#{platform}-#{version}.noarch.rpm")
     when 'deb'
       codename = Pkg::Platforms.codename_for_platform_version(platform, version)
-      return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), "#{repo_name(nonfinal)}-release-#{codename}.deb")
+      return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal),
+                       "#{repo_name(nonfinal)}-release-#{codename}.deb")
     else
-      warn "No release packages for package format '#{package_format}', skipping . . ."
+      warn "No release packages for package format '#{package_format}', skipping."
       return nil
     end
   end
@@ -328,4 +362,15 @@ module Pkg::Paths
     return base_component if component_qualifier == 'repos'
     return full_component
   end
+
+  #for ubuntu-20.04-aarch64, debian package architecture is arm64
+  def package_arch(platform, arch)
+    if platform == 'ubuntu' && arch == 'aarch64'
+      return 'arm64'
+    end
+    arch
+  end
+
+  private :package_arch
+
 end

data/lib/packaging/platforms.rb

@@ -100,7 +100,7 @@ module Pkg
           repo: true,
         },
         '8' => {
-          architectures: ['x86_64', 'aarch64'],
+          architectures: ['x86_64', 'ppc64le', 'aarch64'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -248,7 +248,7 @@ module Pkg
         },
         '20.04' => {
           codename: 'focal',
-          architectures: ['amd64'],
+          architectures: ['amd64', 'aarch64'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,

data/lib/packaging/sign/msi.rb

@@ -71,9 +71,8 @@ for msipath in #{msis.join(" ")}; do
     echo "$msi is already signed, skipping . . ." ;
   else
     tries=5
-    sha1Servers=(http://timestamp.verisign.com/scripts/timstamp.dll
-    http://timestamp.globalsign.com/scripts/timstamp.dll
-    http://www.startssl.com/timestamp)
+    sha1Servers=(http://timestamp.digicert.com/sha1/timestamp
+    http://timestamp.comodoca.com/authenticode)
     for timeserver in "${sha1Servers[@]}"; do
       for ((try=1; try<=$tries; try++)) do
         ret=$(/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe sign \

data/lib/packaging/util/git.rb

@@ -6,7 +6,7 @@ module Pkg::Util::Git
     # Git utility to create a new git commit
     def commit_file(file, message = 'changes')
       fail_unless_repo
-      puts 'Commiting changes:'
+      puts 'Committing changes:'
       puts
       diff, = Pkg::Util::Execution.capture3("#{Pkg::Util::Tool::GIT} diff HEAD #{file}")
       puts diff

data/lib/packaging/util/net.rb

@@ -372,7 +372,7 @@ DOC
     def remote_bundle_install_command
       export_packaging_location = ''
       export_packaging_location = "export PACKAGING_LOCATION='#{ENV['PACKAGING_LOCATION']}';" if ENV['PACKAGING_LOCATION'] && !ENV['PACKAGING_LOCATION'].empty?
-      command = "source /usr/local/rvm/scripts/rvm; rvm use ruby-2.4.1; #{export_packaging_location} bundle install --path .bundle/gems ;"
+      command = "source /usr/local/rvm/scripts/rvm; rvm use ruby-2.5.1; #{export_packaging_location} bundle install --path .bundle/gems ;"
     end
 
     # Given a BuildInstance object and a host, send its params to the host. Return

data/lib/packaging/util/ship.rb

@@ -105,12 +105,22 @@ module Pkg::Util::Ship
   end
 
   def ship_rpms(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/**/*.rpm", "#{local_staging_directory}/**/*.srpm"], Pkg::Config.yum_staging_server, remote_path, opts)
+    things_to_ship = [
+      "#{local_staging_directory}/**/*.rpm",
+      "#{local_staging_directory}/**/*.srpm"
+    ]
+    ship_pkgs(things_to_ship, Pkg::Config.yum_staging_server, remote_path, opts)
   end
 
   def ship_debs(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/**/*.debian.tar.gz", "#{local_staging_directory}/**/*.orig.tar.gz" "#{local_staging_directory}/**/*.dsc", "#{local_staging_directory}/**/*.deb", "#{local_staging_directory}/**/*.changes"], Pkg::Config.apt_signing_server, remote_path, opts)
-
+    things_to_ship = [
+      "#{local_staging_directory}/**/*.debian.tar.gz",
+      "#{local_staging_directory}/**/*.orig.tar.gz",
+      "#{local_staging_directory}/**/*.dsc",
+      "#{local_staging_directory}/**/*.deb",
+      "#{local_staging_directory}/**/*.changes"
+    ]
+    ship_pkgs(things_to_ship, Pkg::Config.apt_signing_server, remote_path, opts)
   end
 
   def ship_svr4(local_staging_directory, remote_path, opts = {})
@@ -122,12 +132,17 @@ module Pkg::Util::Ship
   end
 
   def ship_dmg(local_staging_directory, remote_path, opts = {})
-    packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.dmg"], Pkg::Config.dmg_staging_server, remote_path, opts)
+    packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.dmg"],
+                                      Pkg::Config.dmg_staging_server, remote_path, opts)
 
     if packages_have_shipped
       Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
         # Create the latest symlink for the current supported repo
-        Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(platform_tag, remote_path, opts[:nonfinal]), 'dmg')
+        Pkg::Util::Net.remote_create_latest_symlink(
+          Pkg::Config.project,
+          Pkg::Paths.artifacts_path(platform_tag, remote_path, opts[:nonfinal]),
+          'dmg'
+        )
       end
     end
   end

data/spec/lib/packaging/paths_spec.rb

@@ -3,42 +3,39 @@ require 'spec_helper'
 describe 'Pkg::Paths' do
   describe '#arch_from_artifact_path' do
     arch_transformations = {
-      ['artifacts/aix/6.1/PC1/ppc/puppet-agent-5.1.0.79.g782e03c-1.aix6.1.ppc.rpm', 'aix', '6.1'] => 'power',
-      ['pkg/el-7-x86_64/puppet-agent-4.99.0-1.el7.x86_64.rpm', 'el', '7'] => 'x86_64',
-      ['artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz', 'ubuntu', '16.04'] => 'source',
-      ['http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial', 'ubuntu', '16.04'] => 'amd64',
+      ['artifacts/aix/6.1/puppet6/ppc/puppet-agent-6.9.0-1.aix6.1.ppc.rpm', 'aix', '6.1'] => 'power',
+      ['pkg/el-8-x86_64/puppet-agent-6.9.0-1.el8.x86_64.rpm', 'el', '8'] => 'x86_64',
+      ['pkg/el/8/puppet6/aarch64/puppet-agent-6.5.0.3094.g16b6fa6f-1.el8.aarch64.rpm', 'el', '8'] => 'aarch64',
+      ['artifacts/fedora/32/puppet6/x86_64/puppet-agent-6.9.0-1.fc30.x86_64.rpm', 'fedora', '32'] => 'x86_64',
       ['pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb', 'ubuntu', '16.04'] => 'amd64',
+      ['artifacts/deb/focal/puppet6/puppet-agent_6.5.0.3094.g16b6fa6f-1focal_arm64.deb', 'ubuntu', '20.04'] => 'aarch64',
+
+      ['artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz', 'ubuntu', '16.04'] => 'source',
       ['artifacts/deb/jessie/PC1/puppetserver_5.0.1.master.orig.tar.gz', 'debian', '8'] => 'source',
       ['artifacts/el/6/PC1/SRPMS/puppetserver-5.0.1.master-0.1SNAPSHOT.2017.08.18T0951.el6.src.rpm', 'el', '6'] => 'SRPMS'
     }
     arch_transformations.each do |path_array, arch|
       it "should correctly return #{arch} for #{path_array[0]}" do
-        expect(Pkg::Paths.arch_from_artifact_path(path_array[1], path_array[2], path_array[0])).to eq(arch)
+        expect(Pkg::Paths.arch_from_artifact_path(path_array[1], path_array[2], path_array[0]))
+          .to eq(arch)
       end
     end
   end
 
   describe '#tag_from_artifact_path' do
     path_tranformations = {
-      'artifacts/aix/6.1/PC1/ppc/puppet-agent-5.1.0.79.g782e03c-1.aix6.1.ppc.rpm' => 'aix-6.1-power',
-      'pkg/el-7-x86_64/puppet-agent-4.99.0-1.el7.x86_64.rpm' => 'el-7-x86_64',
-      'pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb' => 'ubuntu-16.04-amd64',
-      'pkg/windows-x64/puppet-agent-4.99.0-x64.msi' => 'windows-2012-x64',
+      'artifacts/aix/6.1/puppet6/ppc/puppet-agent-6.9.0-1.aix6.1.ppc.rpm' => 'aix-6.1-power',
+      'pkg/el-7-x86_64/puppet-agent-5.5.22-1.el8.x86_64.rpm' => 'el-7-x86_64',
+      'pkg/ubuntu-20.04-amd64/puppet-agent_5.5.22-1xenial_amd64.deb' => 'ubuntu-20.04-amd64',
+      'pkg/windows/puppet-agent-5.5.22-x86.msi' => 'windows-2012-x86',
       'artifacts/el/6/products/x86_64/pe-r10k-2.5.4.3-1.el6.x86_64.rpm' => 'el-6-x86_64',
       'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.noarch.rpm' => 'el-6-i386',
-      'pkg/deb/trusty/pe-r10k_2.5.4.3-1trusty_amd64.deb' => 'ubuntu-14.04-amd64',
-      'pkg/pe/deb/xenial/pe-puppetserver_2017.3.0.3-1puppet1_all.deb' => 'ubuntu-16.04-amd64',
-      'pkg/pe/deb/xenial/super-trusty-package_1.0.0-1puppet1_all.deb' => 'ubuntu-16.04-amd64',
-      'artifacts/deb/stretch/PC1/puppetdb_4.3.1-1puppetlabs1_all.deb' => 'debian-9-amd64',
-      'pkg/el/7/PC1/x86_64/puppetdb-4.3.1-1.el7.noarch.rpm' => 'el-7-x86_64',
-      'pkg/apple/10.14/PC1/x86_64/puppet-agent-1.9.0-1.osx10.14.dmg' => 'osx-10.14-x86_64',
-      'artifacts/mac/10.15/PC1/x86_64/puppet-agent-1.9.0-1.osx10.15.dmg' => 'osx-10.15-x86_64',
-      'artifacts/eos/4/PC1/i386/puppet-agent-1.9.0-1.eos4.i386.swix' => 'eos-4-i386',
+      'pkg/deb/bionic/pe-r10k_3.5.2.0-1bionic_amd64.deb' => 'ubuntu-18.04-amd64',
+      'pkg/deb/buster/pe-r10k_3.5.2.0-1buster_amd64.deb' => 'debian-10-amd64',
+      'pkg/pe/deb/bionic/pe-puppetserver_2019.8.2.32-1bionic_all.deb' => 'ubuntu-18.04-amd64',
+      'artifacts/deb/focal/puppet6/puppetdb_6.13.0-1focal_all.deb' => 'ubuntu-20.04-amd64',
+      'pkg/apple/10.15/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg' => 'osx-10.15-x86_64',
       'pkg/windows/puppet-agent-1.9.0-x86.msi' => 'windows-2012-x86',
-      'artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz' => 'ubuntu-16.04-source',
-      'http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial' => 'ubuntu-16.04-amd64',
-      'http://builds.puppetlabs.lan/puppet-agent/0ce4e6a0448366e01537323bbab77f834d7035c7/repos/el/6/PC1/x86_64/' => 'el-6-x86_64',
-      'http://builds.puppetlabs.lan/puppet-agent/0ce4e6a0448366e01537323bbab77f834d7035c7/repos/el/6/PC1/x86_64/' => 'el-6-x86_64',
       'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.src.rpm' => 'el-6-SRPMS',
       'pkg/pe/deb/xenial/pe-puppetserver_2017.3.0.3-1puppet1.orig.tar.gz' => 'ubuntu-16.04-source',
       'pkg/puppet-agent-5.1.0.79.g782e03c.gem' => nil,
@@ -63,10 +60,14 @@ describe 'Pkg::Paths' do
   end
 
   describe '#repo_name' do
+    it 'should return repo_name for final version' do
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
+      expect(Pkg::Paths.repo_name).to eq('puppet6')
+    end
 
     it 'should return repo_name for final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
-      expect(Pkg::Paths.repo_name).to eq('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      expect(Pkg::Paths.repo_name).to eq('FUTURE-puppet7')
     end
 
     it 'should be empty string if repo_name is not set for final version' do
@@ -75,56 +76,84 @@ describe 'Pkg::Paths' do
     end
 
     it 'should return nonfinal_repo_name for non-final version' do
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet5-nightly')
-      expect(Pkg::Paths.repo_name(true)).to eq('puppet5-nightly')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet6-nightly')
+      expect(Pkg::Paths.repo_name(true)).to eq('puppet6-nightly')
     end
 
     it 'should fail if nonfinal_repo_name is not set for non-final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
       expect { Pkg::Paths.repo_name(true) }.to raise_error
     end
   end
 
   describe '#artifacts_path' do
-    before :each do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
-    end
+    context 'all puppet versions' do
+      before :each do
+        allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
+      end
 
-    it 'should be correct for el7' do
-      expect(Pkg::Paths.artifacts_path('el-7-x86_64')).to eq('artifacts/puppet5/el/7/x86_64')
+      it 'should work on all current platforms' do
+        Pkg::Platforms.platform_tags.each do |tag|
+          expect { Pkg::Paths.artifacts_path(tag) }.not_to raise_error
+        end
+      end
     end
 
-    it 'should be correct for bionic' do
-      expect(Pkg::Paths.artifacts_path('ubuntu-18.04-amd64')).to eq('artifacts/bionic/puppet5')
-    end
+    context 'for puppet 6 and prior' do
+      before :each do
+        allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
+      end
 
-    it 'should be correct for solaris 11' do
-      expect(Pkg::Paths.artifacts_path('solaris-11-sparc')).to eq('artifacts/solaris/puppet5/11')
-    end
+      it 'should be correct for el7' do
+        expect(Pkg::Paths.artifacts_path('el-7-x86_64'))
+          .to eq('artifacts/puppet6/el/7/x86_64')
+      end
 
-    it 'should be correct for osx' do
-      expect(Pkg::Paths.artifacts_path('osx-10.15-x86_64')).to eq('artifacts/mac/puppet5/10.15/x86_64')
-    end
+      it 'should be correct for bionic' do
+        expect(Pkg::Paths.artifacts_path('ubuntu-18.04-amd64'))
+          .to eq('artifacts/bionic/puppet6')
+      end
+
+      it 'should be correct for solaris 11' do
+        expect(Pkg::Paths.artifacts_path('solaris-11-sparc'))
+          .to eq('artifacts/solaris/puppet6/11')
+      end
 
-    it 'should be correct for windows' do
-      expect(Pkg::Paths.artifacts_path('windows-2012-x64')).to eq('artifacts/windows/puppet5')
+      it 'should be correct for osx' do
+        expect(Pkg::Paths.artifacts_path('osx-10.15-x86_64'))
+          .to eq('artifacts/mac/puppet6/10.15/x86_64')
+      end
+
+      it 'should be correct for windows' do
+        expect(Pkg::Paths.artifacts_path('windows-2012-x64'))
+          .to eq('artifacts/windows/puppet6')
+      end
     end
 
-    it 'should work on all current platforms' do
-      Pkg::Platforms.platform_tags.each do |tag|
-        expect { Pkg::Paths.artifacts_path(tag) }.not_to raise_error
+    context 'after puppet 7 apt changes' do
+      before :each do
+        allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      end
+
+      it 'should be correct for bionic' do
+        expect(Pkg::Paths.artifacts_path('ubuntu-18.04-amd64'))
+          .to eq('artifacts/FUTURE-puppet7/bionic')
+      end
+      it 'should be correct for focal' do
+        expect(Pkg::Paths.artifacts_path('ubuntu-20.04-amd64'))
+          .to eq('artifacts/FUTURE-puppet7/focal')
       end
     end
   end
 
   describe '#repo_path' do
     before :each do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
     end
 
     it 'should be correct' do
-      expect(Pkg::Paths.repo_path('el-7-x86_64')).to eq('repos/puppet5/el/7/x86_64')
+      expect(Pkg::Paths.repo_path('el-7-x86_64')).to eq('repos/puppet6/el/7/x86_64')
     end
 
     it 'should work on all current platforms' do
@@ -135,8 +164,16 @@ describe 'Pkg::Paths' do
   end
 
   describe '#repo_config_path' do
-    it 'should be correct' do
-      expect(Pkg::Paths.repo_config_path('el-7-x86_64')).to eq('repo_configs/rpm/*el-7-x86_64*.repo')
+    it 'should construct rpm/deb-specific repo configs' do
+      expect(Pkg::Paths.repo_config_path('el-7-x86_64'))
+        .to eq('repo_configs/rpm/*el-7-x86_64*.repo')
+      expect(Pkg::Paths.repo_config_path('ubuntu-18.04-amd64'))
+        .to eq('repo_configs/deb/*bionic*.list')
+    end
+
+    it 'should raise a RuntimeError with unfamilar repo configs' do
+      expect { Pkg::Paths.repo_config_path('bogus') }
+        .to raise_error(/Could not verify that 'bogus' is a valid tag/)
     end
 
     it 'should work on all current platforms' do
@@ -148,15 +185,15 @@ describe 'Pkg::Paths' do
 
   describe '#apt_repo_name' do
     it 'should return `Pkg::Config.repo_name` if set' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
-      allow(Pkg::Config).to receive(:apt_repo_name).and_return('PC1')
-      expect(Pkg::Paths.apt_repo_name).to eq('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
+      allow(Pkg::Config).to receive(:apt_repo_name).and_return('stuff')
+      expect(Pkg::Paths.apt_repo_name).to eq('puppet6')
     end
 
     it 'should return `Pkg::Config.apt_repo_name` if `Pkg::Config.repo_name` is not set' do
       allow(Pkg::Config).to receive(:repo_name).and_return(nil)
-      allow(Pkg::Config).to receive(:apt_repo_name).and_return('PC1')
-      expect(Pkg::Paths.apt_repo_name).to eq('PC1')
+      allow(Pkg::Config).to receive(:apt_repo_name).and_return('puppet6')
+      expect(Pkg::Paths.apt_repo_name).to eq('puppet6')
     end
 
     it 'should return \'main\' if nothing is set' do
@@ -164,14 +201,15 @@ describe 'Pkg::Paths' do
       allow(Pkg::Config).to receive(:apt_repo_name).and_return(nil)
       expect(Pkg::Paths.apt_repo_name).to eq('main')
     end
+
     it 'should return nonfinal_repo_name for nonfinal version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet5-nightly')
-      expect(Pkg::Paths.apt_repo_name(true)).to eq('puppet5-nightly')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('FUTURE-puppet7-nightly')
+      expect(Pkg::Paths.apt_repo_name(true)).to eq('FUTURE-puppet7-nightly')
     end
 
     it 'should fail if nonfinal_repo_name is not set for non-final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
       expect { Pkg::Paths.apt_repo_name(true) }.to raise_error
     end
@@ -179,15 +217,15 @@ describe 'Pkg::Paths' do
 
   describe '#yum_repo_name' do
     it 'should return `Pkg::Config.repo_name` if set' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
-      allow(Pkg::Config).to receive(:yum_repo_name).and_return('PC1')
-      expect(Pkg::Paths.yum_repo_name).to eq('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
+      allow(Pkg::Config).to receive(:yum_repo_name).and_return('stuff')
+      expect(Pkg::Paths.yum_repo_name).to eq('puppet6')
     end
 
     it 'should return `Pkg::Config.yum_repo_name` if `Pkg::Config.repo_name` is not set' do
       allow(Pkg::Config).to receive(:repo_name).and_return(nil)
-      allow(Pkg::Config).to receive(:yum_repo_name).and_return('PC1')
-      expect(Pkg::Paths.yum_repo_name).to eq('PC1')
+      allow(Pkg::Config).to receive(:yum_repo_name).and_return('FUTURE-puppet7')
+      expect(Pkg::Paths.yum_repo_name).to eq('FUTURE-puppet7')
     end
 
     it 'should return \'products\' if nothing is set' do
@@ -197,40 +235,50 @@ describe 'Pkg::Paths' do
     end
 
     it 'should return nonfinal_repo_name for nonfinal version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet5-nightly')
-      expect(Pkg::Paths.yum_repo_name(true)).to eq('puppet5-nightly')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('FUTURE-puppet7-nightly')
+      expect(Pkg::Paths.yum_repo_name(true)).to eq('FUTURE-puppet7-nightly')
     end
 
     it 'should fail if nonfinal_repo_name is not set for non-final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
       expect { Pkg::Paths.yum_repo_name(true) }.to raise_error
     end
   end
 
   describe '#remote_repo_base' do
+    fake_yum_repo_path = '/fake/yum'
+    fake_yum_nightly_repo_path = '/fake/yum-nightly'
+    fake_apt_repo_path = '/fake/apt'
+    fake_apt_nightly_repo_path = '/fake/apt-nightly'
+
     before :each do
-      allow(Pkg::Config).to receive(:yum_repo_path).and_return('foo')
-      allow(Pkg::Config).to receive(:apt_repo_path).and_return('bar')
+      allow(Pkg::Config).to receive(:yum_repo_path).and_return(fake_yum_repo_path)
+      allow(Pkg::Config).to receive(:apt_repo_path).and_return(fake_apt_repo_path)
       allow(Pkg::Config).to receive(:dmg_path).and_return('/opt/downloads/mac')
-      allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return('foo-nightly')
-      allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return('bar-nightly')
+      allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return(fake_yum_nightly_repo_path)
+      allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return(fake_apt_nightly_repo_path)
     end
     it 'returns yum_repo_path for rpms' do
-      expect(Pkg::Paths.remote_repo_base('el-7-x86_64')).to eq('foo')
+      expect(Pkg::Paths.remote_repo_base('el-7-x86_64'))
+        .to eq(fake_yum_repo_path)
     end
     it 'returns apt_repo_path for debs' do
-      expect(Pkg::Paths.remote_repo_base('ubuntu-18.04-amd64')).to eq('bar')
+      expect(Pkg::Paths.remote_repo_base('ubuntu-18.04-amd64'))
+        .to eq(fake_apt_repo_path)
     end
     it 'returns nonfinal_yum_repo_path for nonfinal rpms' do
-      expect(Pkg::Paths.remote_repo_base('fedora-31-x86_64', nonfinal: true)).to eq('foo-nightly')
+      expect(Pkg::Paths.remote_repo_base('fedora-31-x86_64', nonfinal: true))
+        .to eq(fake_yum_nightly_repo_path)
     end
     it 'returns nonfinal_apt_repo_path for nonfinal debs' do
-      expect(Pkg::Paths.remote_repo_base('debian-9-amd64', nonfinal: true)).to eq('bar-nightly')
+      expect(Pkg::Paths.remote_repo_base('debian-9-amd64', nonfinal: true))
+        .to eq(fake_apt_nightly_repo_path)
     end
     it 'fails if neither tag nor package_format is provided' do
-      expect { Pkg::Paths.remote_repo_base }.to raise_error(/Pkg::Paths.remote_repo_base must have/)
+      expect { Pkg::Paths.remote_repo_base }
+        .to raise_error(/Pkg::Paths.remote_repo_base must have/)
     end
 
     it 'returns /opt/downloads if the path is /opt/downloads/<something>' do
@@ -238,56 +286,127 @@ describe 'Pkg::Paths' do
     end
 
     it 'fails for all other package formats' do
-      expect { Pkg::Paths.remote_repo_base('solaris-11-i386') }.to raise_error(/Can't determine remote repo base path/)
+      expect { Pkg::Paths.remote_repo_base('solaris-11-i386') }
+        .to raise_error(/Can't determine remote repo base path/)
     end
   end
 
   describe '#apt_package_base_path' do
     it 'fails for non-debian platforms' do
-      expect { Pkg::Paths.apt_package_base_path('el-7-x86_64', 'puppet6', 'puppet-agent') }.to raise_error(/Can't determine path for non-debian platform/)
+      expect { Pkg::Paths.apt_package_base_path('el-7-x86_64', 'puppet6', 'puppet-agent') }
+        .to raise_error(/Can't determine path for non-debian platform/)
     end
-    it 'returns the approprate apt repo path' do
-      allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository/apt')
-      expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'puppet6', 'puppet-agent')).to eq('/opt/repository/apt/pool/bionic/puppet6/p/puppet-agent')
-      expect(Pkg::Paths.apt_package_base_path('debian-9-amd64', 'puppet6', 'razor-server')).to eq('/opt/repository/apt/pool/stretch/puppet6/r/razor-server')
+
+    context 'for puppet 6 and prior' do
+      it 'returns the approprate apt repo path' do
+        allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository/apt')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'puppet6', 'puppet-agent'))
+          .to eq('/opt/repository/apt/pool/bionic/puppet6/p/puppet-agent')
+        expect(Pkg::Paths.apt_package_base_path('debian-9-amd64', 'puppet6', 'bolt-server'))
+          .to eq('/opt/repository/apt/pool/stretch/puppet6/b/bolt-server')
+
+
+      end
+      it 'returns the appropriate nonfinal repo path' do
+        allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository-nightlies/apt')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'puppet6-nightly',
+                                                'puppet-agent', true))
+          .to eq('/opt/repository-nightlies/apt/pool/bionic/puppet6-nightly/p/puppet-agent')
+        expect(Pkg::Paths.apt_package_base_path('debian-10-amd64', 'puppet6-nightly',
+                                                'pdk', true))
+          .to eq('/opt/repository-nightlies/apt/pool/buster/puppet6-nightly/p/pdk')
+      end
     end
-    it 'returns the appropriate nonfinal repo path' do
-      allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository-nightlies/apt')
-      expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'puppet6-nightly', 'puppet-agent', true)).to eq('/opt/repository-nightlies/apt/pool/bionic/puppet6-nightly/p/puppet-agent')
-      expect(Pkg::Paths.apt_package_base_path('debian-9-amd64', 'puppet6-nightly', 'razor-server', true)).to eq('/opt/repository-nightlies/apt/pool/stretch/puppet6-nightly/r/razor-server')
+
+    context 'for puppet 7 and after' do
+      it 'returns the approprate apt repo path' do
+        allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository/apt')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'FUTURE-puppet7', 'puppet-agent'))
+          .to eq('/opt/repository/apt/FUTURE-puppet7/pool/bionic/p/puppet-agent')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-20.04-amd64', 'FUTURE-puppet7', 'puppet-agent'))
+          .to eq('/opt/repository/apt/FUTURE-puppet7/pool/focal/p/puppet-agent')
+      end
+      it 'returns the appropriate nonfinal repo path' do
+        allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository-nightlies/apt')
+        expect(Pkg::Paths.apt_package_base_path('debian-10-amd64', 'FUTURE-puppet7-nightly', 'pdk', true))
+          .to eq('/opt/repository-nightlies/apt/FUTURE-puppet7-nightly/pool/buster/p/pdk')
+      end
     end
   end
 
   describe '#release_package_link_path' do
-    repo_name = 'puppet6'
-    nonfinal_repo_name = 'puppet6-nightly'
-    yum_repo_path = '/opt/repository/yum'
-    apt_repo_path = '/opt/repository/apt'
-    nonfinal_yum_repo_path = '/opt/repository-nightlies/yum'
-    nonfinal_apt_repo_path = '/opt/repository-nightlies/apt'
-    before :each do
-      allow(Pkg::Config).to receive(:repo_name).and_return(repo_name)
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nonfinal_repo_name)
-      allow(Pkg::Config).to receive(:yum_repo_path).and_return(yum_repo_path)
-      allow(Pkg::Config).to receive(:apt_repo_path).and_return(apt_repo_path)
-      allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return(nonfinal_yum_repo_path)
-      allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return(nonfinal_apt_repo_path)
-    end
-    it 'returns the appropriate link path for rpm release packages' do
-      expect(Pkg::Paths.release_package_link_path('sles-12-ppc64le')).to eq("#{yum_repo_path}/#{repo_name}-release-sles-12.noarch.rpm")
-    end
-    it 'returns the appropriate link path for deb release packages' do
-      expect(Pkg::Paths.release_package_link_path('ubuntu-16.04-amd64')).to eq("#{apt_repo_path}/#{repo_name}-release-xenial.deb")
-    end
-    it 'returns the appropriate link path for nonfinal rpm release packages' do
-      expect(Pkg::Paths.release_package_link_path('el-7-x86_64', true)).to eq("#{nonfinal_yum_repo_path}/#{nonfinal_repo_name}-release-el-7.noarch.rpm")
-    end
-    it 'returns the appropriate link path for nonfinal deb release packages' do
-      expect(Pkg::Paths.release_package_link_path('debian-9-i386', true)).to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-stretch.deb")
+    context 'for puppet 6' do
+      repo_name = 'puppet6'
+      nonfinal_repo_name = 'puppet6-nightly'
+      yum_repo_path = '/opt/repository/yum'
+      apt_repo_path = '/opt/repository/apt'
+      nonfinal_yum_repo_path = '/opt/repository-nightlies/yum'
+      nonfinal_apt_repo_path = '/opt/repository-nightlies/apt'
+      before :each do
+        allow(Pkg::Config).to receive(:repo_name).and_return(repo_name)
+        allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nonfinal_repo_name)
+        allow(Pkg::Config).to receive(:yum_repo_path).and_return(yum_repo_path)
+        allow(Pkg::Config).to receive(:apt_repo_path).and_return(apt_repo_path)
+        allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return(nonfinal_yum_repo_path)
+        allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return(nonfinal_apt_repo_path)
+      end
+      it 'returns the appropriate link path for rpm release packages' do
+        expect(Pkg::Paths.release_package_link_path('sles-12-ppc64le'))
+          .to eq("#{yum_repo_path}/#{repo_name}-release-sles-12.noarch.rpm")
+      end
+      it 'returns the appropriate link path for deb release packages' do
+        expect(Pkg::Paths.release_package_link_path('ubuntu-16.04-amd64'))
+          .to eq("#{apt_repo_path}/#{repo_name}-release-xenial.deb")
+      end
+      it 'returns the appropriate link path for nonfinal rpm release packages' do
+        expect(Pkg::Paths.release_package_link_path('el-7-x86_64', true))
+          .to eq("#{nonfinal_yum_repo_path}/#{nonfinal_repo_name}-release-el-7.noarch.rpm")
+      end
+      it 'returns the appropriate link path for nonfinal deb release packages' do
+        expect(Pkg::Paths.release_package_link_path('debian-9-i386', true))
+          .to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-stretch.deb")
+      end
+      it 'returns nil for package formats that do not have release packages' do
+        expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
+        expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
+      end
     end
-    it 'returns nil for package formats that do not have release packages' do
-      expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
-      expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
+
+    context 'for puppet 7' do
+      repo_name = 'FUTURE-puppet7'
+      nonfinal_repo_name = 'FUTURE-puppet7-nightly'
+      yum_repo_path = '/opt/repository/yum'
+      apt_repo_path = '/opt/repository/apt'
+      nonfinal_yum_repo_path = '/opt/repository-nightlies/yum'
+      nonfinal_apt_repo_path = '/opt/repository-nightlies/apt'
+      before :each do
+        allow(Pkg::Config).to receive(:repo_name).and_return(repo_name)
+        allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nonfinal_repo_name)
+        allow(Pkg::Config).to receive(:yum_repo_path).and_return(yum_repo_path)
+        allow(Pkg::Config).to receive(:apt_repo_path).and_return(apt_repo_path)
+        allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return(nonfinal_yum_repo_path)
+        allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return(nonfinal_apt_repo_path)
+      end
+      it 'returns the appropriate link path for rpm release packages' do
+        expect(Pkg::Paths.release_package_link_path('sles-12-ppc64le'))
+          .to eq("#{yum_repo_path}/#{repo_name}-release-sles-12.noarch.rpm")
+      end
+      it 'returns the appropriate link path for deb release packages' do
+        expect(Pkg::Paths.release_package_link_path('ubuntu-20.04-amd64'))
+          .to eq("#{apt_repo_path}/#{repo_name}-release-focal.deb")
+      end
+      it 'returns the appropriate link path for nonfinal rpm release packages' do
+        expect(Pkg::Paths.release_package_link_path('el-8-x86_64', true))
+          .to eq("#{nonfinal_yum_repo_path}/#{nonfinal_repo_name}-release-el-8.noarch.rpm")
+      end
+      it 'returns the appropriate link path for nonfinal deb release packages' do
+        expect(Pkg::Paths.release_package_link_path('debian-10-i386', true))
+          .to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-buster.deb")
+      end
+      it 'returns nil for package formats that do not have release packages' do
+        expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
+        expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
+      end
     end
   end
 end