packaging 0.99.57 → 0.99.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a26342fa551df9cbae2afbc9b8c1c03aa03bd7001ef16511598013735d1b400
-  data.tar.gz: d29a92aa8e936a01df40db513e02e98763c0e6a74a8a5801ad47a242f4e4b67b
+  metadata.gz: 51f93e35b2b4e64053f41aef02546deaa59b2ef0f5ee2c84839f1caf5f5a678c
+  data.tar.gz: f5d99ceffa53426ff02533f901cc80080fb4202b0c53ccc34094e2c5cd2a6049
 SHA512:
-  metadata.gz: 3bfafe308304409ca317f83c3fc514607a9732fb064c040fe6a12f35eb8282620d3c9c3acf58acfa66d2c269318b8938a83126c10fecf546b8be61cc4350e540
-  data.tar.gz: cde4572cbe48d14bd039d7b8e94bedc2d3584a674637a47a1310049180a651661ed7e450af2977b15bae435b0bc8bb6fb44e371f36922507311ebe02941f6107
+  metadata.gz: f1dbac744ef49d74eeb5c7cbf0e5afa2b4cf8d23d1984ca79a5af78a78165044ebc9008e3ad747bb7205156b7dae22e0b366a7cb50fcf50393133ef4316759d1
+  data.tar.gz: d8338b79efa5280c0a72d33b6a1b4de28b0ee25d265e2ea33f786786c33c3ce97aa4238d8bdc90ed726f2acef4231e918ba451207616d3261aa4e865df5a1a4c

data/lib/packaging/artifactory.rb

@@ -2,67 +2,7 @@ require 'artifactory'
 require 'uri'
 require 'open-uri'
 require 'digest'
-
-#
-# [eric.griswold] This is unfortunate. The 'pattern_search' class method really does belong in
-# the Artifactory gem. However, because of some of Chef's social policies,
-# I am unwilling to contribute this code there. If that changes, I'll submit a PR. Until
-# then, it'll live here.
-#
-module Artifactory
-  class Resource::Artifact
-    #
-    # Search for an artifact in a repo using an Ant-like pattern.
-    # Unlike many Artifactory searches, this one is restricted to a single
-    # repository.
-    #
-    # @example Search in a repository named 'foo_local' for an artifact in a directory containing
-    #   the word "recent", named "artifact[0-9].txt"
-    #   Artifact.pattern_search(pattern: '*recent*/artifact[0-9].txt',
-    #                           repo: 'foo_local')
-    #
-    # @param [Hash] options
-    #   A hash of options, as follows:
-    #
-    # @option options [Artifactory::Client] :client
-    #   the client object to make the request with
-    # @option options [String] :pattern
-    #   the Ant-like pattern to use for finding artifacts within the repos. Note that the
-    #   Ant pattern '**' is barred in this case by JFrog.
-    # @option options [String] :repo
-    #   the repo to search
-    #
-    # @return [Array<Resource::Artifact>]
-    #   a list of artifacts that match the query
-    #
-    def self.pattern_search(options = {})
-      client = extract_client!(options)
-      params = Util.slice(options, :pattern, :repo)
-      pattern_search_parameter = { :pattern => "#{params[:repo]}:#{params[:pattern]}" }
-      response = client.get('/api/search/pattern', pattern_search_parameter)
-      return [] if response['files'].nil? || response['files'].empty?
-
-      # A typical response:
-      # {
-      #  "repoUri"=>"https:<artifactory endpoint>/<repo>",
-      #  "sourcePattern"=>"<repo>:<provided search pattern>",
-      #  "files"=>[<filename that matched pattern>, ...]
-      # }
-      #
-      # Inserting '/api/storage' before the repo makes the 'from_url' call work correctly.
-      #
-      repo_uri = response['repoUri']
-      unless repo_uri.include?('/api/storage/')
-        # rubocop:disable Style/PercentLiteralDelimiters
-        repo_uri.sub!(%r(/#{params[:repo]}$), "/api/storage/#{params[:repo]}")
-      end
-      response['files'].map do |file_path|
-        from_url("#{repo_uri}/#{file_path}", client: client)
-      end
-    end
-  end
-end
-
+require 'packaging/artifactory/extensions'
 
 module Pkg
 
@@ -111,7 +51,6 @@ module Pkg
     def location_for(platform_tag)
       toplevel_repo = DEFAULT_REPO_TYPE
       repo_subdirectories = File.join(@repo_base, @project, @project_version)
-      alternate_subdirectories = repo_subdirectories
 
       unless platform_tag == DEFAULT_REPO_TYPE
         format = Pkg::Platforms.package_format_for_tag(platform_tag)
@@ -122,20 +61,16 @@ module Pkg
       when 'rpm'
         toplevel_repo = 'rpm'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{version}-#{architecture}")
-        alternate_subdirectories = repo_subdirectories
       when 'deb'
         toplevel_repo = 'debian__local'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{version}")
-        alternate_subdirectories = File.join('pool', repo_subdirectories)
       when 'swix', 'dmg', 'svr4', 'ips'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{version}-#{architecture}")
-        alternate_subdirectories = repo_subdirectories
       when 'msi'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{architecture}")
-        alternate_subdirectories = repo_subdirectories
       end
 
-      [toplevel_repo, repo_subdirectories, alternate_subdirectories]
+      [toplevel_repo, repo_subdirectories]
     end
 
     # @param platform_tag [String] The platform tag specific to the information
@@ -150,8 +85,8 @@ module Pkg
         end
       end
 
-      repo_name, repo_subdirectories, alternate_subdirectories = location_for(platform_tag)
-      full_artifactory_path = File.join(repo_name, alternate_subdirectories)
+      repo_name, repo_subdirectories = location_for(platform_tag)
+      full_artifactory_path = File.join(repo_name, repo_subdirectories)
 
       {
         platform: platform,
@@ -161,7 +96,6 @@ module Pkg
         package_format: package_format,
         repo_name: repo_name,
         repo_subdirectories: repo_subdirectories,
-        alternate_subdirectories: alternate_subdirectories,
         full_artifactory_path: full_artifactory_path
       }
     end
@@ -235,7 +169,7 @@ module Pkg
     #
     #   Currently we are including everything that would be included in the yaml
     #   file that is generated at package build time.
-    def deploy_properties(platform_tag)
+    def deploy_properties(platform_tag, file_name)
       data = platform_specific_data(platform_tag)
 
       # TODO This method should be returning the entire contents of the yaml
@@ -246,10 +180,15 @@ module Pkg
       #properties_hash = Pkg::Config.config_to_hash
       properties_hash = {}
       if data[:package_format] == 'deb'
+        architecture = data[:architecture]
+        # set arch correctly for noarch packages
+        if file_name =~ /_all\.deb$/
+          architecture = 'all'
+        end
         properties_hash.merge!({
           'deb.distribution' => data[:codename],
           'deb.component' => data[:repo_subdirectories],
-          'deb.architecture' => data[:architecture],
+          'deb.architecture' => architecture,
         })
       end
       properties_hash
@@ -281,8 +220,8 @@ module Pkg
       headers = { "X-Checksum-Md5" => artifact_md5 }
       artifact.upload(
         data[:repo_name],
-        File.join(data[:alternate_subdirectories], File.basename(package)),
-        deploy_properties(platform_tag),
+        File.join(data[:repo_subdirectories], File.basename(package)),
+        deploy_properties(platform_tag, File.basename(package)),
         headers
       )
     rescue
@@ -408,18 +347,34 @@ module Pkg
     # Using the manifest provided by enterprise-dist, grab the appropropriate packages from artifactory based on md5sum
     # @param staging_directory [String] location to download packages to
     # @param manifest [File] JSON file containing information about what packages to download and the corresponding md5sums
-    def download_packages(staging_directory, manifest)
+    # @param remote_path [String] Optional partial path on the remote host containing packages
+    #        Used to specify which subdirectories packages will be downloaded from.
+    def download_packages(staging_directory, manifest, remote_path = '')
       check_authorization
       manifest.each do |dist, packages|
         puts "Grabbing the #{dist} packages from artifactory"
         packages.each do |name, info|
-          artifact_to_download = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"]).first
+          filename = info['filename']
+          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename)
+          artifact_to_download = artifacts.select { |artifact| artifact.download_uri.include? remote_path }.first
+          # If we found matching artifacts, but not in the correct path, copy the artifact to the correct path
+          # This should help us keep repos up to date with the packages we are expecting to be there
+          # while helping us avoid 'what the hell, could not find package' errors
+          if artifact_to_download.nil? && !artifacts.empty?
+            artifact_to_copy = artifacts.first
+            copy_artifact(artifact_to_copy, artifact_to_copy.repo, "#{remote_path}/#{dist}/#{filename}")
+            artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename)
+            artifact_to_download = artifacts.select { |artifact| artifact.download_uri.include? remote_path }.first
+          end
+
           if artifact_to_download.nil?
-            filename = info["filename"] || info["name"]
-            raise "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
+            message = "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
+            unless remote_path.empty?
+              message += " in #{remote_path}"
+            end
+            raise message
           else
             full_staging_path = "#{staging_directory}/#{dist}"
-            filename = info['filename'] || File.basename(artifact_to_download.download_uri)
             puts "downloading #{artifact_to_download.download_uri} to #{File.join(full_staging_path, filename)}"
             artifact_to_download.download(full_staging_path, filename: filename)
           end
@@ -454,14 +409,19 @@ module Pkg
     # @param local_path [String] local path to file to upload
     # @param target_repo [String] repo on artifactory to upload to
     # @param target_path [String] path within target_repo to upload to
-    def upload_file(local_path, target_repo, target_path)
+    # @param properties [Hash] Optional property names and values to assign the uploaded file
+    #   For example, this would set both the 'cleanup.skip' and 'deb.component' properties:
+    #   \{ "cleanup.skip" => true, "deb.component" => 'bionic' \}
+    # @param headers [Hash] Optional upload headers, most likely checksums, for the upload request
+    #   "X-Checksum-Md5" and "X-Checksum-Sha1" are typical
+    def upload_file(local_path, target_repo, target_path, properties = {}, headers = {})
       fail "Error: Couldn't find file at #{local_path}." unless File.exist? local_path
       check_authorization
       artifact = Artifactory::Resource::Artifact.new(local_path: local_path)
       full_upload_path = File.join(target_path, File.basename(local_path))
       begin
         puts "Uploading #{local_path} to #{target_repo}/#{full_upload_path} . . ."
-        artifact.upload(target_repo, full_upload_path)
+        artifact.upload(target_repo, full_upload_path, properties, headers)
       rescue Artifactory::Error::HTTPError => e
         fail "Error: Upload failed. Ensure path #{target_path} exists in the #{target_repo} repository."
       end
@@ -583,6 +543,33 @@ module Pkg
       end
     end
 
+    # Copy an artifact to a target repo/path
+    #
+    # @param artifact [Artifactory::Resource::Artifact] The artifact to be copied
+    # @param target_repo [String] The repository to copy the artifact to
+    # @param target_path [String] The path in the target repository to copy the artifact to
+    # @param target_debian_component [String] `deb.component` property to set on the copied artifact
+    #        defaults to `Pkg::Paths.debian_component_from_path(target_path)`
+    def copy_artifact(artifact, target_repo, target_path, target_debian_component = nil)
+      filename = File.basename(artifact.download_uri)
+      artifactory_target_path = "#{target_repo}/#{target_path}"
+      puts "Copying #{artifact.download_uri} to #{artifactory_target_path}"
+      begin
+        artifact.copy(artifactory_target_path)
+      rescue Artifactory::Error::HTTPError
+        STDERR.puts "Could not copy #{artifactory_target_path}. Source and destination are the same. Skipping..."
+      end
+
+      if File.extname(filename) == '.deb'
+        target_debian_component ||= Pkg::Paths.debian_component_from_path(target_path)
+        copied_artifact_search = search_with_path(filename, target_repo, target_path)
+        fail "Error: what the hell, could not find just-copied package #{filename} under #{target_repo}/#{target_path}" if copied_artifact_search.empty?
+        copied_artifact = copied_artifact_search.first
+        properties = { 'deb.component' => target_debian_component }
+        copied_artifact.properties(properties)
+      end
+     end
+
     # When we cut a new PE branch, we need to copy the pe components into <pe_version>/{repos,feature,release}/<platform>
     # @param manifest [File] JSON file containing information about what packages to download and the corresponding md5sums
     # @param target_path [String] path on artifactory to copy components to, e.g. <pe_version>/release
@@ -591,26 +578,12 @@ module Pkg
       manifest.each do |dist, packages|
         puts "Copying #{dist} packages..."
         packages.each do |name, info|
-          artifact = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"]).first
+          filename = info["filename"]
+          artifact = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename).first
           if artifact.nil?
-            filename = info["filename"] || info["name"]
             raise "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
           end
-          begin
-            filename = info["filename"] || File.basename(artifact.download_uri)
-            artifact_target_path = "#{artifact.repo}/#{target_path}/#{dist}/#{filename}"
-            puts "Copying #{artifact.download_uri} to #{artifact_target_path}"
-            artifact.copy(artifact_target_path)
-          rescue Artifactory::Error::HTTPError
-            STDERR.puts "Could not copy #{artifact_target_path}. Source and destination are the same. Skipping..."
-          end
-          if File.extname(filename) == '.deb'
-            copied_artifact_search = Artifactory::Resource::Artifact.pattern_search(repo: 'debian_enterprise__local', pattern: "#{target_path}/*/#{filename}")
-            fail "Error: what the hell, could not find just-copied package #{filename} under debian_enterprise__local/#{target_path}" if copied_artifact_search.nil?
-            copied_artifact = copied_artifact_search.first
-            properties = { 'deb.component' => Pkg::Paths.debian_component_from_path(target_path) }
-            copied_artifact.properties(properties)
-          end
+          copy_artifact(artifact, artifact.repo, "#{target_path}/#{dist}/#{filename}")
         end
       end
     end
@@ -639,7 +612,8 @@ module Pkg
       manifest.each do |dist, packages|
         packages.each do |package_name, info|
           next unless package_name == package
-          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: repos)
+          filename = info["filename"]
+          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: repos, name: filename)
           artifacts.each do |artifact|
             next unless artifact.download_uri.include? remote_path
             puts "Removing reverted package #{artifact.download_uri}"
@@ -659,7 +633,7 @@ module Pkg
       Dir.foreach("#{tarball_path}/") do |pe_tarball|
         next if pe_tarball == '.' || pe_tarball == ".."
         md5 = Digest::MD5.file("#{tarball_path}/#{pe_tarball}").hexdigest
-        artifacts_to_delete = Artifactory::Resource::Artifact.checksum_search(md5: md5, repos: pe_repo)
+        artifacts_to_delete = Artifactory::Resource::Artifact.checksum_search(md5: md5, repos: pe_repo, name: pe_tarball)
         next if artifacts_to_delete.nil?
         begin
           artifacts_to_delete.each do |artifact|

data/lib/packaging/artifactory/extensions.rb

@@ -0,0 +1,94 @@
+require 'artifactory'
+
+module ArtifactoryExtensions
+  module ClassMethods
+    #
+    # Search for an artifact in a repo using an Ant-like pattern.
+    # Unlike many Artifactory searches, this one is restricted to a single
+    # repository.
+    #
+    # @example Search in a repository named 'foo_local' for an artifact in a directory containing
+    #   the word "recent", named "artifact[0-9].txt"
+    #   Artifact.pattern_search(pattern: '*recent*/artifact[0-9].txt',
+    #                           repo: 'foo_local')
+    #
+    # @param [Hash] options
+    #   A hash of options, as follows:
+    #
+    # @option options [Artifactory::Client] :client
+    #   the client object to make the request with
+    # @option options [String] :pattern
+    #   the Ant-like pattern to use for finding artifacts within the repos. Note that the
+    #   Ant pattern '**' is barred in this case by JFrog.
+    # @option options [String] :repo
+    #   the repo to search
+    #
+    # @return [Array<Resource::Artifact>]
+    #   a list of artifacts that match the query
+    #
+    def pattern_search(options = {})
+      client = extract_client!(options)
+      params = Util.slice(options, :pattern, :repo)
+      pattern_search_parameter = { :pattern => "#{params[:repo]}:#{params[:pattern]}" }
+      response = client.get('/api/search/pattern', pattern_search_parameter)
+      return [] if response['files'].nil? || response['files'].empty?
+
+      # A typical response:
+      # {
+      #  "repoUri"=>"https:<artifactory endpoint>/<repo>",
+      #  "sourcePattern"=>"<repo>:<provided search pattern>",
+      #  "files"=>[<filename that matched pattern>, ...]
+      # }
+      #
+      # Inserting '/api/storage' before the repo makes the 'from_url' call work correctly.
+      #
+      repo_uri = response['repoUri']
+      unless repo_uri.include?('/api/storage/')
+        # rubocop:disable Style/PercentLiteralDelimiters
+        repo_uri.sub!(%r(/#{params[:repo]}$), "/api/storage/#{params[:repo]}")
+      end
+      response['files'].map do |file_path|
+        from_url("#{repo_uri}/#{file_path}", client: client)
+      end
+    end
+
+    # This adds the `exact_match` option to artifactory search, and defaults it
+    # to true. With `exact_match` set to `true` the artifact will only be
+    # returned if the name in the download uri matches the name we're trying to
+    # download
+    def search(options = {})
+      exact_match = options[:exact_match].nil? ? true : options[:exact_match]
+      artifacts = super
+
+      if exact_match
+        artifacts.select! { |artifact| File.basename(artifact.download_uri) == options[:name] }
+      end
+      artifacts
+    end
+
+    # This adds the `name` option to artifactory checksum search. It defaults to
+    # unset. If set, the artifact is only returned if the download uri matches
+    # the passed name
+    def checksum_search(options = {})
+      artifacts = super
+      if options[:name]
+        artifacts.select! { |artifact| File.basename(artifact.download_uri) == options[:name] }
+      end
+      artifacts
+    end
+  end
+
+  # needed to prepend class methods, see https://stackoverflow.com/questions/18683750/how-to-prepend-classmethods
+  def self.prepended(base)
+    class << base
+      prepend ClassMethods
+    end
+  end
+end
+
+module Artifactory
+  class Resource::Artifact
+    # use prepend instead of monkeypatching so we can call `super`
+    prepend ArtifactoryExtensions
+  end
+end

data/lib/packaging/paths.rb

@@ -70,15 +70,6 @@ module Pkg::Paths
     end
   end
 
-  # Method to determine if files should be shipped to legacy or current path
-  # structures. Any repo name matching /^puppet/ is a current repo, everything
-  # else is should be shipped to legacy paths.
-  #
-  # @param repo_name The repo name to check
-  def is_legacy_repo?(repo_name)
-    repo_name !~ /^puppet/
-  end
-
   # Method to determine the yum repo name. Maintains compatibility with legacy
   # projects, where `Pkg::Config.yum_repo_name` is set instead of
   # `Pkg::Config.repo_name`. Defaults to 'products' if nothing is set.
@@ -110,65 +101,83 @@ module Pkg::Paths
     return Pkg::Config.repo_link_target
   end
 
-  # TODO: please please please clean this up
-  # This is so terrible. I really dislike it. But in order to maintain backward
-  # compatibility, we need to maintain these path differences between PC1 and
-  # everything else. Once we stop shipping things to PC1, we can remove all the
-  # PC1 specific cases. That's likely to not happen until the current LTS
-  # (2016.4) is EOL'd. Hopefully also we do not choose to further change these
-  # path structures, as it is no bueno.
-  # --MAS 2017-08-16
-  def artifacts_base_path_and_link_path(platform_tag, path_prefix = 'artifacts', nonfinal = false)
-    platform, version, architecture = Pkg::Platforms.parse_platform_tag(platform_tag)
-    package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
+  # Construct a platform-dependent symlink target path.
+  def construct_base_path(path_data)
+    package_format = path_data[:package_format]
+    prefix = path_data[:prefix]
+    is_nonfinal = path_data[:is_nonfinal]
+    platform_name = path_data[:platform_name]
+    platform_tag = path_data[:platform_tag]
 
     case package_format
+    when 'deb'
+      debian_code_name = Pkg::Platforms.get_attribute(platform_tag, :codename)
+      return File.join(prefix, debian_code_name, apt_repo_name(is_nonfinal))
+    when 'dmg'
+      return File.join(prefix, 'mac', repo_name(is_nonfinal))
+    when 'msi'
+      return File.join(prefix, platform_name, repo_name(is_nonfinal))
     when 'rpm'
-      if is_legacy_repo?(yum_repo_name(nonfinal))
-        [File.join(path_prefix, platform, version, yum_repo_name(nonfinal)), nil]
-      else
-        [File.join(path_prefix, yum_repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, link_name(nonfinal))]
-      end
+      return File.join(prefix, yum_repo_name(is_nonfinal))
     when 'swix'
-      if is_legacy_repo?(repo_name(nonfinal))
-        [File.join(path_prefix, platform, version, repo_name(nonfinal)), nil]
-      else
-        [File.join(path_prefix, platform, repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, platform, link_name(nonfinal))]
-      end
+      return File.join(prefix, platform_name, repo_name(is_nonfinal))
+    when 'svr4', 'ips'
+      return File.join(prefix, 'solaris', repo_name(is_nonfinal))
+    else
+      raise "Error: Unknown package format '#{package_format}'"
+    end
+  end
+
+  # Construct a platform-dependent link path
+  def construct_link_path(path_data)
+    package_format = path_data[:package_format]
+    prefix = path_data[:prefix]
+    platform_name = path_data[:platform_name]
+    platform_tag = path_data[:platform_tag]
+    link = path_data[:link]
+
+    return nil if link.nil?
+
+    case package_format
+    when 'rpm'
+      return File.join(prefix, link)
+    when 'swix'
+      return File.join(prefix, platform_name, link)
     when 'deb'
-      [File.join(path_prefix, Pkg::Platforms.get_attribute(platform_tag, :codename), apt_repo_name(nonfinal)),
-       link_name(nonfinal).nil? ? nil : File.join(path_prefix, Pkg::Platforms.get_attribute(platform_tag, :codename), link_name(nonfinal))]
+      debian_code_name = Pkg::Platforms.get_attribute(platform_tag, :codename)
+      return File.join(prefix, debian_code_name, link)
     when 'svr4', 'ips'
-      if is_legacy_repo?(repo_name(nonfinal))
-        [File.join(path_prefix, 'solaris', repo_name(nonfinal), version), nil]
-      else
-        [File.join(path_prefix, 'solaris', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'solaris', link_name(nonfinal))]
-      end
+      return File.join(prefix, 'solaris', link)
     when 'dmg'
-      if is_legacy_repo?(repo_name(nonfinal))
-        [File.join(path_prefix, 'mac', version, repo_name(nonfinal)), nil]
-      else
-        [File.join(path_prefix, 'mac', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'mac', link_name(nonfinal))]
-      end
+      return File.join(prefix, 'mac', link)
     when 'msi'
-      if is_legacy_repo?(repo_name(nonfinal))
-        [File.join(path_prefix, 'windows'), nil]
-      else
-        [File.join(path_prefix, platform, repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, platform, link_name(nonfinal))]
-      end
+      return File.join(prefix, platform, link)
     else
-      raise "Not sure where to find packages with a package format of '#{package_format}'"
+      raise "Error: Unknown package format '#{package_format}'"
     end
   end
 
-  # TODO: please please please clean this up
-  # This is so terrible. I really dislike it. But in order to maintain backward
-  # compatibility, we need to maintain these path differences between PC1 and
-  # everything else. Once we stop shipping things to PC1, we can remove all the
-  # PC1 specific cases. That's likely to not happen until the current LTS
-  # (2016.4) is EOL'd. Hopefully also we do not choose to further change these
-  # path structures, as it is no bueno.
-  # --MAS 2017-08-16
+  # Given platform information, create symlink target (base_path) and link path in the
+  # form of a 2-element array
+  def artifacts_base_path_and_link_path(platform_tag, prefix = 'artifacts', is_nonfinal = false)
+    platform_name, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+    package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
+
+    path_data = {
+      is_nonfinal: is_nonfinal,
+      link: link_name(is_nonfinal),
+      package_format: package_format,
+      platform_name: platform_name,
+      platform_tag: platform_tag,
+      prefix: prefix
+    }
+
+    return [
+      construct_base_path(path_data),
+      construct_link_path(path_data)
+    ]
+  end
+
   def artifacts_path(platform_tag, path_prefix = 'artifacts', nonfinal = false)
     base_path, _ = artifacts_base_path_and_link_path(platform_tag, path_prefix, nonfinal)
     platform, version, architecture = Pkg::Platforms.parse_platform_tag(platform_tag)
@@ -176,31 +185,15 @@ module Pkg::Paths
 
     case package_format
     when 'rpm'
-      if is_legacy_repo?(yum_repo_name(nonfinal))
-        File.join(base_path, architecture)
-      else
-        File.join(base_path, platform, version, architecture)
-      end
+      File.join(base_path, platform, version, architecture)
     when 'swix'
-      if is_legacy_repo?(repo_name(nonfinal))
-        File.join(base_path, architecture)
-      else
-        File.join(base_path, version, architecture)
-      end
+      File.join(base_path, version, architecture)
     when 'deb'
       base_path
     when 'svr4', 'ips'
-      if is_legacy_repo?(repo_name(nonfinal))
-        base_path
-      else
-        File.join(base_path, version)
-      end
+      File.join(base_path, version)
     when 'dmg'
-      if is_legacy_repo?(repo_name(nonfinal))
-        File.join(base_path, architecture)
-      else
-        File.join(base_path, version, architecture)
-      end
+      File.join(base_path, version, architecture)
     when 'msi'
       base_path
     else
@@ -304,9 +297,18 @@ module Pkg::Paths
   end
 
   def debian_component_from_path(path)
-    matches = path.match(/(\d+\.\d+)\/(\w+)/)
+    # substitute '.' and '/' since those aren't valid characters for debian components
+    matches = path.match(/([\d+\.\d+|master])\/(\w+)/)
+    regex_for_substitution = /[\.\/]/
     fail "Error: Could not determine Debian Component from path #{path}" if matches.nil?
-    return matches[1] if matches[2] == 'repos'
-    return matches[0]
+    base_component = matches[1]
+    component_qualifier = matches[2]
+    full_component = "#{base_component}/#{component_qualifier}"
+    unless regex_for_substitution.nil?
+      base_component.gsub!(regex_for_substitution, '_')
+      full_component.gsub!(regex_for_substitution, '_')
+    end
+    return base_component if component_qualifier == 'repos'
+    return full_component
   end
 end

data/lib/packaging/platforms.rb

@@ -47,26 +47,7 @@ module Pkg
         },
       },
 
-      'cumulus' => {
-        '2.2' => {
-          codename: 'cumulus',
-          architectures: ['amd64'],
-          source_architecture: 'source',
-          package_format: 'deb',
-          source_package_formats: DEBIAN_SOURCE_FORMATS,
-          repo: true,
-        },
-      },
-
       'debian' => {
-        '7' => {
-          codename: 'wheezy',
-          architectures: ['amd64', 'i386'],
-          source_architecture: 'source',
-          package_format: 'deb',
-          source_package_formats: DEBIAN_SOURCE_FORMATS,
-          repo: true,
-        },
         '8' => {
           codename: 'jessie',
           architectures: ['amd64', 'i386', 'powerpc'],
@@ -103,7 +84,7 @@ module Pkg
           repo: true,
         },
         '6' => {
-          architectures: ['x86_64', 'i386', 's390x'],
+          architectures: ['x86_64', 'i386'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -111,7 +92,7 @@ module Pkg
           repo: true,
         },
         '7' => {
-          architectures: ['x86_64', 's390x', 'ppc64le', 'aarch64'],
+          architectures: ['x86_64', 'ppc64le', 'aarch64'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -137,78 +118,6 @@ module Pkg
       },
 
       'fedora' => {
-        'f25' => {
-          architectures: ['x86_64', 'i386'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        'f26' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        'f27' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        'f28' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        '25' => {
-          architectures: ['x86_64', 'i386'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        '26' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        '27' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        '28' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
-        '29' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
-        },
         '30' => {
           architectures: ['x86_64'],
           source_architecture: 'SRPMS',
@@ -228,26 +137,6 @@ module Pkg
       },
 
       'osx' => {
-        '10.10' => {
-          architectures: ['x86_64'],
-          package_format: 'dmg',
-          repo: false,
-        },
-        '10.11' => {
-          architectures: ['x86_64'],
-          package_format: 'dmg',
-          repo: false,
-        },
-        '10.12' => {
-          architectures: ['x86_64'],
-          package_format: 'dmg',
-          repo: false,
-        },
-        '10.13' => {
-          architectures: ['x86_64'],
-          package_format: 'dmg',
-          repo: false,
-        },
         '10.14' => {
           architectures: ['x86_64'],
           package_format: 'dmg',
@@ -273,7 +162,7 @@ module Pkg
 
       'sles' => {
         '11' => {
-          architectures: ['x86_64', 'i386', 's390x'],
+          architectures: ['x86_64', 'i386'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -281,7 +170,7 @@ module Pkg
           repo: true,
         },
         '12' => {
-          architectures: ['x86_64', 's390x', 'ppc64le'],
+          architectures: ['x86_64', 'ppc64le'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -344,6 +233,14 @@ module Pkg
           source_package_formats: DEBIAN_SOURCE_FORMATS,
           repo: true,
         },
+        '20.04' => {
+          codename: 'focal',
+          architectures: ['amd64'],
+          source_architecture: 'source',
+          package_format: 'deb',
+          source_package_formats: DEBIAN_SOURCE_FORMATS,
+          repo: true,
+        },
       },
 
       'windows' => {

data/lib/packaging/sign/ips.rb

@@ -31,10 +31,10 @@ module Pkg::Sign::Ips
       #            - Sean P. McDonald
       #
       # We sign the entire repo
-      sign_cmd = "sudo -E /usr/bin/pkgsign -c /root/signing/signing_cert_2018.pem \
+      sign_cmd = "sudo -E /usr/bin/pkgsign -c /root/signing/signing_cert_2020.pem \
                   -i /root/signing/Thawte_SHA256_Code_Signing_CA.pem \
                   -i /root/signing/Thawte_Primary_Root_CA.pem \
-                  -k /root/signing/signing_key_2018.pem \
+                  -k /root/signing/signing_key_2020.pem \
                   -s 'file://#{work_dir}/repo' '*'"
       puts "About to sign #{p5p} with #{sign_cmd} in #{work_dir}"
       Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, sign_cmd.squeeze(' '))

data/spec/lib/packaging/artifactory_spec.rb

@@ -21,6 +21,11 @@ describe 'artifactory.rb' do
         :repo_config => "../repo_configs/deb/pl-puppet-agent-f65f9efbb727c3d2d72d6799c0fc345a726f27b5-xenial.list",
         :additional_artifacts => ["./deb/xenial/PC1/puppet-agent-extras_5.3.1.34.gf65f9ef-1xenial_amd64.deb"],
       },
+      'debian-10-amd64' => {
+        :artifact => "./deb/buster/PC1/puppetdb_5.3.1.34.gf65f9ef-1buster_all.deb",
+        :repo_config => "../repo_configs/deb/pl-puppetdb-f65f9efbb727c3d2d72d6799c0fc345a726f27b5-buster.list",
+        :additional_artifacts => ["./deb/buster/PC1/puppetdb-termini_5.3.1.34.gf65f9ef-1buster_all.deb"],
+      },
       'windows-2012-x86' => {
         :artifact => "./windows/puppet-agent-5.3.1.34-x86.msi",
         :repo_config => '',
@@ -36,10 +41,10 @@ describe 'artifactory.rb' do
         :repo_config => '',
         :additional_artifacts => ["./eos/4/PC1/i386/puppet-agent-extras-5.3.1.34.gf65f9ef-1.eos4.i386.swix"],
       },
-      'osx-10.12-x86_64' => {
-        :artifact => "./apple/10.12/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.12.dmg",
+      'osx-10.15-x86_64' => {
+        :artifact => "./apple/10.15/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg",
         :repo_config => '',
-        :additional_artifacts => ["./apple/10.12/PC1/x86_64/puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.12.dmg"],
+        :additional_artifacts => ["./apple/10.15/PC1/x86_64/puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.15.dmg"],
       },
       'solaris-10-sparc' => {
         :artifact => "./solaris/10/PC1/puppet-agent-5.3.1.34.gf65f9ef-1.sparc.pkg.gz",
@@ -64,6 +69,14 @@ describe 'artifactory.rb' do
       :package_name => 'path/to/a/xenial/package/puppet-agent_5.3.1.34.gf65f9ef-1xenial_amd64.deb',
       :all_package_names => ['puppet-agent_5.3.1.34.gf65f9ef-1xenial_amd64.deb', 'puppet-agent-extras_5.3.1.34.gf65f9ef-1xenial_amd64.deb']
     },
+    'debian-10-amd64' => {
+      :toplevel_repo => 'debian__local',
+      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/debian-10",
+      :codename => 'buster',
+      :arch => 'all',
+      :package_name => 'path/to/a/buster/package/puppetdb_5.3.1.34.gf65f9ef-1buster_all.deb',
+      :all_package_names => ['puppetdb_5.3.1.34.gf65f9ef-1buster_all.deb', 'puppetdb-termini_5.3.1.34.gf65f9ef-1buster_all.deb']
+    },
     'windows-2012-x86' => {
       :toplevel_repo => 'generic',
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/windows-x86",
@@ -82,11 +95,11 @@ describe 'artifactory.rb' do
       :package_name => 'path/to/an/eos/4/package/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix',
       :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.eos4.i386.swix']
     },
-    'osx-10.12-x86_64' => {
+    'osx-10.15-x86_64' => {
       :toplevel_repo => 'generic',
-      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.12-x86_64",
-      :package_name => 'path/to/an/osx/10.12/package/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.12.dmg',
-      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.osx10.12.dmg', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.12.dmg']
+      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.15-x86_64",
+      :package_name => 'path/to/an/osx/10.15/package/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg',
+      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.15.dmg']
     },
     'solaris-10-sparc' => {
       :toplevel_repo => 'generic',
@@ -112,7 +125,6 @@ describe 'artifactory.rb' do
           expect(artifact.location_for(platform_tag)).to match_array([
             platform_tag_data[:toplevel_repo],
             platform_tag_data[:repo_subdirectories],
-            File.join('pool', platform_tag_data[:repo_subdirectories])
           ])
         end
       else
@@ -120,7 +132,6 @@ describe 'artifactory.rb' do
           expect(artifact.location_for(platform_tag)).to match_array([
             platform_tag_data[:toplevel_repo],
             platform_tag_data[:repo_subdirectories],
-            platform_tag_data[:repo_subdirectories]
           ])
         end
       end
@@ -129,7 +140,6 @@ describe 'artifactory.rb' do
         expect(artifact.location_for('generic')).to match_array([
           'generic',
           File.join(default_repo_name, project, project_version),
-          File.join(default_repo_name, project, project_version)
         ])
       end
     end
@@ -186,12 +196,13 @@ describe 'artifactory.rb' do
     describe '#deploy_properties' do
       it "returns the correct contents for the deploy properties for #{platform_tag}" do
         if platform_tag_data[:codename]
-          expect(artifact.deploy_properties(platform_tag)).to include({
+          expect(artifact.deploy_properties(platform_tag, File.basename(platform_tag_data[:package_name]))).to include({
             'deb.distribution' => platform_tag_data[:codename],
-            'deb.component' => platform_tag_data[:repo_subdirectories]
+            'deb.component' => platform_tag_data[:repo_subdirectories],
+            'deb.architecture' => platform_tag_data[:arch]
           })
         else
-          expect(artifact.deploy_properties(platform_tag)).not_to include({
+          expect(artifact.deploy_properties(platform_tag, File.basename(platform_tag_data[:package_name]))).not_to include({
             'deb.component' => platform_tag_data[:repo_subdirectories]
           })
         end

data/spec/lib/packaging/config_spec.rb

@@ -203,22 +203,20 @@ describe "Pkg::Config" do
   describe "#platform_data" do
     platform_tags = [
       'eos-4-i386',
-      'osx-10.12-x86_64',
+      'osx-10.15-x86_64',
       'cisco-wrlinux-7-x86_64',
       'ubuntu-16.04-i386',
-      'cumulus-2.2-amd64',
-      'el-6-s390x',
+      'el-6-x86_64',
       'el-7-ppc64le',
       'sles-12-x86_64',
     ]
 
     artifacts = \
       "./artifacts/eos/4/PC1/i386/puppet-agent-5.3.2-1.eos4.i386.swix\n" \
-      "./artifacts/apple/10.12/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.12.dmg\n" \
+      "./artifacts/apple/10.15/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.15.dmg\n" \
       "./artifacts/cisco-wrlinux/7/PC1/x86_64/puppet-agent-5.3.2-1.cisco_wrlinux7.x86_64.rpm\n" \
       "./artifacts/deb/xenial/PC1/puppet-agent_5.3.2-1xenial_i386.deb\n" \
-      "./artifacts/deb/cumulus/PC1/puppet-agent_5.3.2-1cumulus_amd64.deb\n" \
-      "./artifacts/el/6/PC1/s390x/puppet-agent-5.3.2.658.gc79ef9a-1.el6.s390x.rpm\n" \
+      "./artifacts/el/6/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.el6.x86_64.rpm\n" \
       "./artifacts/el/7/PC1/ppc64le/puppet-agent-5.3.2-1.el7.ppc64le.rpm\n" \
       "./artifacts/sles/12/PC1/x86_64/puppet-agent-5.3.2-1.sles12.x86_64.rpm"
 
@@ -226,7 +224,7 @@ describe "Pkg::Config" do
       "./artifacts/aix/6.1/PC1/ppc/puppet-agent-5.3.2-1.aix6.1.ppc.rpm"
 
     fedora_artifacts = \
-      "./artifacts/fedora/f25/PC1/x86_64/puppet-agent-5.3.2-1.fedoraf25.x86_64.rpm"
+      "./artifacts/fedora/31/PC1/x86_64/puppet-agent-5.3.2-1.fc31.x86_64.rpm"
 
     windows_artifacts = \
       "./artifacts/windows/puppet-agent-x64.msi\n" \
@@ -283,8 +281,8 @@ describe "Pkg::Config" do
     it "should not use 'f' in fedora platform tags" do
       allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(fedora_artifacts, nil)
       data = Pkg::Config.platform_data
-      expect(data).to include('fedora-25-x86_64')
-      expect(data).not_to include('fedora-f25-x86_64')
+      expect(data).to include('fedora-31-x86_64')
+      expect(data).not_to include('fedora-f31-x86_64')
     end
 
     it "should collect packages whose extname differ from package_format" do

data/spec/lib/packaging/paths_spec.rb

@@ -25,16 +25,15 @@ describe 'Pkg::Paths' do
       '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/el/6/products/x86_64/pe-r10k-2.5.4.3-1.el6.x86_64.rpm' => 'el-6-x86_64',
-      'pkg/deb/trusty/pe-r10k_2.5.4.3-1trusty_amd64.deb' => 'ubuntu-14.04-amd64',
       '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/wheezy/PC1/puppetdb_4.3.1-1puppetlabs1_all.deb' => 'debian-7-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.11/PC1/x86_64/puppet-agent-1.9.0-1.osx10.11.dmg' => 'osx-10.11-x86_64',
-      'artifacts/mac/10.11/PC1/x86_64/puppet-agent-1.9.0-1.osx10.11.dmg' => 'osx-10.11-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/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb' => 'cumulus-2.2-amd64',
       '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',
@@ -96,8 +95,8 @@ describe 'Pkg::Paths' do
       expect(Pkg::Paths.artifacts_path('el-7-x86_64')).to eq('artifacts/puppet5/el/7/x86_64')
     end
 
-    it 'should be correct for trusty' do
-      expect(Pkg::Paths.artifacts_path('ubuntu-14.04-amd64')).to eq('artifacts/trusty/puppet5')
+    it 'should be correct for bionic' do
+      expect(Pkg::Paths.artifacts_path('ubuntu-18.04-amd64')).to eq('artifacts/bionic/puppet5')
     end
 
     it 'should be correct for solaris 11' do
@@ -105,7 +104,7 @@ describe 'Pkg::Paths' do
     end
 
     it 'should be correct for osx' do
-      expect(Pkg::Paths.artifacts_path('osx-10.10-x86_64')).to eq('artifacts/mac/puppet5/10.10/x86_64')
+      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 windows' do
@@ -210,32 +209,6 @@ describe 'Pkg::Paths' do
     end
   end
 
-  describe '#is_legacy_repo?' do
-    it 'returns true for empty strings' do
-      expect(Pkg::Paths.is_legacy_repo?('')).to be_true
-    end
-
-    it 'returns true for PC1' do
-      expect(Pkg::Paths.is_legacy_repo?('PC1')).to be_true
-    end
-
-    it 'returns true for foopuppetbar' do
-      expect(Pkg::Paths.is_legacy_repo?('foopuppetbar')).to be_true
-    end
-
-    it 'returns false for puppet5' do
-      expect(Pkg::Paths.is_legacy_repo?('puppet5')).to be_false
-    end
-
-    it 'returns false for puppet8-nightly' do
-      expect(Pkg::Paths.is_legacy_repo?('puppet8-nightly')).to be_false
-    end
-
-    it 'returns false for puppet' do
-      expect(Pkg::Paths.is_legacy_repo?('puppet')).to be_false
-    end
-  end
-
   describe '#remote_repo_base' do
     before :each do
       allow(Pkg::Config).to receive(:yum_repo_path).and_return('foo')
@@ -250,7 +223,7 @@ describe 'Pkg::Paths' do
       expect(Pkg::Paths.remote_repo_base('ubuntu-18.04-amd64')).to eq('bar')
     end
     it 'returns nonfinal_yum_repo_path for nonfinal rpms' do
-      expect(Pkg::Paths.remote_repo_base('fedora-29-x86_64', true)).to eq('foo-nightly')
+      expect(Pkg::Paths.remote_repo_base('fedora-31-x86_64', true)).to eq('foo-nightly')
     end
     it 'returns nonfinal_apt_repo_path for nonfinal debs' do
       expect(Pkg::Paths.remote_repo_base('debian-9-amd64', true)).to eq('bar-nightly')
@@ -304,7 +277,7 @@ describe 'Pkg::Paths' 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.13-x86_64')).to eq(nil)
+      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

data/spec/lib/packaging/platforms_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Pkg::Platforms' do
   describe '#by_package_format' do
     it 'should return an array of platforms that use a given format' do
-      deb_platforms = ['cumulus', 'debian', 'ubuntu']
+      deb_platforms = ['debian', 'ubuntu']
       rpm_platforms = ['aix', 'cisco-wrlinux', 'el', 'fedora', 'redhatfips', 'sles']
       expect(Pkg::Platforms.by_package_format('deb')).to match_array(deb_platforms)
       expect(Pkg::Platforms.by_package_format('rpm')).to match_array(rpm_platforms)
@@ -19,7 +19,7 @@ describe 'Pkg::Platforms' do
 
   describe '#supported_platforms' do
     it 'should return all supported platforms' do
-      platforms = ['aix', 'cisco-wrlinux', 'cumulus', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
+      platforms = ['aix', 'cisco-wrlinux', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
       expect(Pkg::Platforms.supported_platforms).to match_array(platforms)
     end
   end
@@ -36,7 +36,7 @@ describe 'Pkg::Platforms' do
 
   describe '#codenames' do
     it 'should return all codenames for a given platform' do
-      codenames = ['bionic', 'buster', 'cosmic', 'cumulus', 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial']
+      codenames = ['focal', 'bionic', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end
@@ -59,27 +59,27 @@ describe 'Pkg::Platforms' do
 
   describe '#arches_for_codename' do
     it 'should return an array of arches corresponding to a given codename' do
-      expect(Pkg::Platforms.arches_for_codename('trusty')).to match_array(['i386', 'amd64'])
+      expect(Pkg::Platforms.arches_for_codename('xenial')).to match_array(['amd64', 'i386', 'ppc64el'])
     end
 
     it 'should be able to include source archietectures' do
-      expect(Pkg::Platforms.arches_for_codename('trusty', true)).to match_array(['i386', 'amd64', 'source'])
+      expect(Pkg::Platforms.arches_for_codename('xenial', true)).to match_array(["amd64", "i386", "ppc64el", "source"])
     end
   end
 
   describe '#codename_to_tags' do
     it 'should return an array of platform tags corresponding to a given codename' do
-      expect(Pkg::Platforms.codename_to_tags('trusty')).to match_array(['ubuntu-14.04-i386', 'ubuntu-14.04-amd64'])
+      expect(Pkg::Platforms.codename_to_tags('xenial')).to match_array(['ubuntu-16.04-i386', 'ubuntu-16.04-amd64', "ubuntu-16.04-ppc64el"])
     end
   end
 
   describe '#arches_for_platform_version' do
     it 'should return an array of arches for a given platform and version' do
-      expect(Pkg::Platforms.arches_for_platform_version('sles', '11')).to match_array(['i386', 'x86_64', 's390x'])
+      expect(Pkg::Platforms.arches_for_platform_version('sles', '12')).to match_array(['x86_64', 'ppc64le'])
     end
 
     it 'should be able to include source architectures' do
-      expect(Pkg::Platforms.arches_for_platform_version('sles', '11', true)).to match_array(['i386', 'x86_64', 's390x', 'SRPMS'])
+      expect(Pkg::Platforms.arches_for_platform_version('sles', '12', true)).to match_array(["SRPMS", "ppc64le", "x86_64"])
     end
   end
 
@@ -98,12 +98,12 @@ describe 'Pkg::Platforms' do
 
   describe '#platform_lookup' do
     it 'should return a hash of platform info' do
-      expect(Pkg::Platforms.platform_lookup('osx-10.10-x86_64')).to be_instance_of(Hash)
+      expect(Pkg::Platforms.platform_lookup('osx-10.15-x86_64')).to be_instance_of(Hash)
     end
 
     it 'should include at least arch and package format keys' do
-      expect(Pkg::Platforms.platform_lookup('osx-10.10-x86_64').keys).to include(:architectures)
-      expect(Pkg::Platforms.platform_lookup('osx-10.10-x86_64').keys).to include(:package_format)
+      expect(Pkg::Platforms.platform_lookup('osx-10.15-x86_64').keys).to include(:architectures)
+      expect(Pkg::Platforms.platform_lookup('osx-10.15-x86_64').keys).to include(:package_format)
     end
   end
 
@@ -137,7 +137,7 @@ describe 'Pkg::Platforms' do
       'windows-2012' => ['windows', '2012', ''],
       'redhatfips-7-x86_64' => ['redhatfips', '7', 'x86_64'],
       'el-7-SRPMS' => ['el', '7', 'SRPMS'],
-      'ubuntu-14.04-source' => ['ubuntu', '14.04', 'source'],
+      'ubuntu-16.04-source' => ['ubuntu', '16.04', 'source'],
     }
 
     fail_cases = [

data/spec/lib/packaging/retrieve_spec.rb

@@ -12,7 +12,7 @@ describe 'Pkg::Retrieve' do
     'aix-6.1-power' => {:artifact => './aix/6.1/PC1/ppc/puppet-agent-5.3.2.155.gb25e649-1.aix6.1.ppc.rpm'},
     'el-7-x86_64' => {:artifact => './el/7/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.el7.x86_64.rpm'},
     'osx-10.11-x86_64' => {:artifact => './apple/10.11/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx10.11.dmg'},
-    'sles-11-s390x' => {:artifact => './sles/11/PC1/s390x/puppet-agent-5.3.2.155.gb25e649-1.sles11.s390x.rpm'},
+    'sles-11-i386' => {:artifact => './sles/11/PC1/i386/puppet-agent-5.3.2.155.gb25e649-1.sles11.i386.rpm'},
     'solaris-10-sparc' => {:artifact => './solaris/10/PC1/puppet-agent-5.3.2.155.gb25e649-1.sparc.pkg.gz'},
     'ubuntu-16.04-amd64' => {:artifact => './deb/xenial/PC1/puppet-agent_5.3.2.155.gb25e649-1xenial_amd64.deb'},
     'windows-2012-x64' => {:artifact => './windows/puppet-agent-x64.msi'},

data/spec/lib/packaging/sign_spec.rb

@@ -74,7 +74,6 @@ DOC
       ] }
       let(:v4_rpms) { [
         "#{rpm_directory}/el/7/PC1/aarch64/puppet-agent-5.5.3-1.el7.aarch64.rpm",
-        "#{rpm_directory}/sles/12/PC1/s390x/puppet-agent-5.5.3-1.sles12.s390x.rpm",
       ] }
       let(:rpms) { rpms_not_to_sign + v3_rpms + v4_rpms }
       let(:already_signed_rpms) { [

data/spec/lib/packaging/util/ship_spec.rb

@@ -43,21 +43,21 @@ describe '#Pkg::Util::Ship' do
   end
 
 local_pkgs = [
-  'pkg/deb/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb',
-  'pkg/deb/wheezy/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1wheezy_i386.deb',
+  'pkg/deb/stretch/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1stretch_i386.deb',
   'pkg/el/5/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.el5.x86_64.rpm',
   'pkg/sles/11/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
-  'pkg/mac/10.10/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.10.dmg',
+  'pkg/sles/12/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.sles12.x86_64.rpm',
+  'pkg/mac/10.15/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.15.dmg',
   'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
   'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
   'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
 ]
 new_pkgs = [
-  'pkg/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb',
-  'pkg/wheezy/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1wheezy_i386.deb',
+  'pkg/stretch/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1stretch_i386.deb',
   'pkg/puppet5/el/5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.el5.x86_64.rpm',
   'pkg/puppet5/sles/11/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
-  'pkg/mac/puppet5/10.10/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.10.dmg',
+  'pkg/puppet5/sles/12/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.sles12.x86_64.rpm',
+  'pkg/mac/puppet5/10.15/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.15.dmg',
   'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
   'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
   'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.57
+  version: 0.99.62
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -107,6 +107,7 @@ files:
 - lib/packaging.rb
 - lib/packaging/archive.rb
 - lib/packaging/artifactory.rb
+- lib/packaging/artifactory/extensions.rb
 - lib/packaging/config.rb
 - lib/packaging/config/params.rb
 - lib/packaging/deb.rb
@@ -245,27 +246,27 @@ specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
 - spec/lib/packaging_spec.rb
+- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb