packaging 0.99.40 → 0.99.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 29234ce00ec3d4e6b806de21de5146a170c5ae50
-  data.tar.gz: 225084d9ba126f53ef36aab40c3a35a48696a5bd
+SHA256:
+  metadata.gz: 4ac7070ff94ebd455cb676a068b288cf6a66bd67cb9b9fae886b939cd122f33e
+  data.tar.gz: 2f54c6d07e0c1dfa1a1a8e08e95d818727da0d2e3857f7673e3fa16f1aac7d3b
 SHA512:
-  metadata.gz: 4f9ec133dc94d0cd44ff0c8a926ced515688a2bbfbf9810ab4cd7c5a7c9b3e0dabb2224c14814723965c3477fc0a0bc0381a6030519a46dfd70cb55f4f181ebd
-  data.tar.gz: 0a030c97eb33c623b9852a0459a45a3e2ec0906cafd9d5a9536a5b433852687358f3444c183e524244f809422252db15b7c05ce7f8240a4e96a2bf14b729a10d
+  metadata.gz: 0ad7a909bf0daaa570ca54266efe75aff45e0b3f48b8a0553c26048d5f694c2db92f5e5571a8bc4ee142f1776d55b7ee3f7816fbd63ac4ec5d3eed4ac08c29f6
+  data.tar.gz: 515edd1fc993713e6c465ce085f97470208d070ca0bb16dd3e2ebc7f61b319b9edd60a8263a4ed5087574b6bfeb81e3dbb75a553a6860804370607ca2be20144

data/lib/packaging/artifactory.rb

@@ -1,7 +1,69 @@
+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
+
+
 module Pkg
 
   # The Artifactory class
@@ -10,6 +72,11 @@ module Pkg
   # artifacts to the repos, and to retrieve them back from the repos.
   class ManageArtifactory
 
+    # The Artifactory property that the artifactCleanup user plugin
+    # {https://github.com/jfrog/artifactory-user-plugins/tree/master/cleanup/artifactCleanup}
+    # uses to tell it to not clean a particular artifact
+    ARTIFACTORY_CLEANUP_SKIP_PROPERTY = 'cleanup.skip'
+
     DEFAULT_REPO_TYPE = 'generic'
     DEFAULT_REPO_BASE = 'development'
 
@@ -24,8 +91,6 @@ module Pkg
     # @option :repo_base [String] The base of all repos, set for consistency.
     #   This currently defaults to 'development'
     def initialize(project, project_version, opts = {})
-      require 'artifactory'
-
       @artifactory_uri = opts[:artifactory_uri] || 'https://artifactory.delivery.puppetlabs.net/artifactory'
       @repo_base = opts[:repo_base] || DEFAULT_REPO_BASE
 
@@ -297,17 +362,20 @@ module Pkg
       # get the artifact name
       artifact_names = all_package_names(yaml_data[:platform_data], platform_tag)
       artifact_names.each do |artifact_name|
-        artifact_to_promote = Artifactory::Resource::Artifact.search(name: artifact_name, :artifactory_uri => @artifactory_uri)
+        artifact_search_results = Artifactory::Resource::Artifact.search(
+          name: artifact_name, :artifactory_uri => @artifactory_uri)
 
-        if artifact_to_promote.empty?
+        if artifact_search_results.empty?
           raise "Error: could not find PKG=#{pkg} at REF=#{git_ref} for #{platform_tag}"
         end
+        artifact_to_promote = artifact_search_results[0]
 
         # This makes an assumption that we're using some consistent repo names
         # but need to either prepend 'rpm_' or 'debian_' based on package type
-        if File.extname(artifact_name) == '.rpm'
+        case File.extname(artifact_name)
+        when '.rpm'
           promotion_path = "rpm_#{repository}/#{platform_tag}/#{artifact_name}"
-        elsif File.extname(artifact_name) == '.deb'
+        when '.deb'
           promotion_path = "debian_#{repository}/#{platform_tag}/#{artifact_name}"
           properties = { 'deb.component' => debian_component } unless debian_component.nil?
         else
@@ -315,8 +383,9 @@ module Pkg
         end
 
         begin
-          puts "promoting #{artifact_name} to #{promotion_path}"
-          artifact_to_promote[0].copy(promotion_path)
+          source_path = artifact_to_promote.download_uri.sub(@artifactory_uri, '')
+          puts "promoting #{artifact_name} from #{source_path} to #{promotion_path}"
+          artifact_to_promote.copy(promotion_path)
           unless properties.nil?
             artifacts = Artifactory::Resource::Artifact.search(name: artifact_name, :artifactory_uri => @artifactory_uri)
             promoted_artifact = artifacts.select { |artifact| artifact.download_uri =~ %r{#{promotion_path}} }.first
@@ -356,21 +425,201 @@ module Pkg
     end
 
     # Ship PE tarballs to specified artifactory repo and paths
-    # @param tarball_path [String] the path of the tarballs to ship
+    # @param local_tarball_directory [String] the local directory containing the tarballs
     # @param target_repo [String] the artifactory repo to ship the tarballs to
-    # @param ship_paths [Array] the artifactory path(s) to ship the tarballs to within the target_repo
-    def ship_pe_tarballs(tarball_path, target_repo, ship_paths)
+    # @param ship_paths [Array] the artifactory path(s) to ship the tarballs to within
+    #   the target_repo
+    def ship_pe_tarballs(local_tarball_directory, target_repo, ship_paths)
       check_authorization
-      Dir.foreach("#{tarball_path}/") do |pe_tarball|
-        unless pe_tarball == '.' || pe_tarball == ".."
-          ship_paths.each do |path|
-            begin
-              puts "Uploading #{pe_tarball} to #{target_repo}/#{path}... "
-              artifact = Artifactory::Resource::Artifact.new(local_path: "#{tarball_path}/#{pe_tarball}")
-              artifact.upload(target_repo, "/#{path}/#{pe_tarball}")
-            rescue Errno::EPIPE
-              STDERR.puts "Error: Could not upload #{pe_tarball} to #{path}"
+      ship_paths.each do |path|
+        unset_cleanup_skip_on_artifacts(target_repo, path)
+        Dir.foreach(local_tarball_directory) do |pe_tarball|
+          next if pe_tarball == '.' || pe_tarball == ".."
+          begin
+            puts "Uploading #{pe_tarball} to #{target_repo}/#{path}#{pe_tarball}"
+            artifact = Artifactory::Resource::Artifact.new(
+              local_path: "#{local_tarball_directory}/#{pe_tarball}")
+            uploaded_artifact = artifact.upload(target_repo, "#{path}#{pe_tarball}")
+            # The Artifactory gem property setter only works when '/api/storage' is used in
+            # the 'uri' field.
+            # Strangely, the above Artifactory::Resource::Artifact.new gives us the raw URI.
+            # Therefore we are forced to do some path surgery, inserting
+            # '/api/storage' before "/#{target_repo}" to make the property setting work.
+            storage_artifact = uploaded_artifact
+            unless storage_artifact.uri.include?("/api/storage")
+              storage_artifact.uri = storage_artifact.uri.sub(
+                "/#{target_repo}",
+                "/api/storage/#{target_repo}")
             end
+            storage_artifact.properties(ARTIFACTORY_CLEANUP_SKIP_PROPERTY => true)
+          rescue Errno::EPIPE
+            ## [eric.griswold] maybe this should be fatal?
+            STDERR.puts "Warning: Could not upload #{pe_tarball} to #{target_repo}/#{path}. Skipping."
+            next
+          end
+        end
+      end
+    end
+
+    # Upload file to Artifactory
+    # @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)
+      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)
+      rescue Artifactory::Error::HTTPError => e
+        fail "Error: Upload failed. Ensure path #{target_path} exists in the #{target_repo} repository."
+      end
+    end
+
+    # Clear the ARTIFACTORY_CLEANUP_SKIP_PROPERTY on all artifacts in
+    # a specified directory in a given Artifactory repo that match
+    # /<directory>/*.tar. Use this before uploading newer tarballs to maintain
+    # 'cleanup.skip' on the latest tarballs only.
+    #
+    # @param repo [String] Artifactory repository that contains the specified directory
+    # @param directory [String] Artifactory directory in repo containing the artifacts from which to
+    #   set the 'cleanup.skip' property setting to false
+    def unset_cleanup_skip_on_artifacts(repo, directory)
+      artifacts_with_cleanup_skip = Artifactory::Resource::Artifact.property_search(
+        ARTIFACTORY_CLEANUP_SKIP_PROPERTY => true,
+        "repos" => repo
+      )
+
+      # For the upcoming directory check, make sure we know where our trailing slashes are.
+      directory_no_trailing_slashes = directory.sub(/(\/)+$/, '')
+
+      # For all tarball artifacts in #{directory} that have the Artifactory property
+      # 'cleanup.skip' set to true, set it to 'false'
+      artifacts_with_cleanup_skip.each do |artifact|
+        next unless artifact.uri.include?("/#{directory_no_trailing_slashes}/")
+        artifact.properties(ARTIFACTORY_CLEANUP_SKIP_PROPERTY => false)
+      end
+    end
+
+    # Download an artifact based on name, repo, and path to artifact
+    # @param artifact_name [String] name of artifact to download
+    # @param repo [String] repo the artifact lives
+    # @param path [String] path to artifact in the repo
+    def download_artifact(artifact_name, repo, path)
+      check_authorization
+      artifacts = Artifactory::Resource::Artifact.search(name: artifact_name, repos: repo)
+      artifacts.each do |artifact|
+        if artifact.download_uri.include? path
+          artifact.download('.')
+        end
+      end
+    end
+
+    # Download final pe tarballs to local path based on name, repo, and path on artifactory
+    # @param pe_version [String] pe final tag
+    # @param repo [String] repo the tarballs live
+    # @param remote_path [String] path to tarballs in the repo
+    # @param local_path [String] local path to download tarballs to
+    def download_final_pe_tarballs(pe_version, repo, remote_path, local_path)
+      check_authorization
+      artifacts = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo)
+      artifacts.each do |artifact|
+        next unless artifact.download_uri.include? remote_path
+        next if artifact.download_uri.include? "-rc"
+        artifact.download(local_path)
+      end
+    end
+
+    # Download beta pe tarballs to local path based on tag, repo, and path on artifactory
+    # @param beta_tag [String] rc tag of beta release ex. 2019.2.0-rc10
+    # @param repo [String] repo the tarballs live
+    # @param remote_path [String] path to tarballs in the repo
+    # @param local_path [String] local path to download tarballs to
+    def download_beta_pe_tarballs(beta_tag, repo, remote_path, local_path)
+      check_authorization
+      pattern = "#{remote_path}/*-#{beta_tag}-*"
+      artifacts = Artifactory::Resource::Artifact.pattern_search(repo: repo, pattern: pattern)
+      artifacts.each do |artifact|
+        artifact.download(local_path)
+      end
+    end
+
+    # When we ship a new PE release we copy final tarballs to archives/releases
+    # @param pe_version [String] pe final tag
+    # @param repo [String] repo the tarballs live
+    # @param remote_path [String] path to tarballs in the repo
+    # @param target_path [String] path copy tarballs to, assumes same repo
+    def copy_final_pe_tarballs(pe_version, repo, remote_path, target_path)
+      check_authorization
+      final_tarballs = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo)
+      final_tarballs.each do |artifact|
+        next unless artifact.download_uri.include? remote_path
+        next if artifact.download_uri.include? "-rc"
+        artifact.copy("#{repo}/#{target_path}")
+      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
+    def populate_pe_repos(manifest, target_path)
+      check_authorization
+      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
+          if artifact.nil?
+            raise "Error: what the hell, could not find package #{info["filename"]} with md5sum #{info["md5"]}"
+          end
+          begin
+            artifact_target_path = "#{artifact.repo}/#{target_path}/#{dist}/#{info["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(info["filename"]) == '.deb'
+            copied_artifact_search = Artifactory::Resource::Artifact.pattern_search(repo: 'debian_enterprise__local', pattern: "#{target_path}/*/#{info["filename"]}")
+            fail "Error: what the hell, could not find just-copied package #{info["filename"]} under debian_enterprise__local/#{target_path}" if copied_artifact_search.nil?
+            copied_artifact = copied_artifact_search.first
+            properties = { 'deb.component' => Pkg::Paths.two_digit_pe_version_from_path(target_path) }
+            copied_artifact.properties(properties)
+          end
+        end
+      end
+    end
+
+    # Remove all artifacts in repo based on pattern, used when we purge all artifacts in release/ after PE release
+    # @param repos [Array] repos that we want to search for artifacts in
+    # @param pattern [String] pattern for artifacts that should be deleted ex. `2019.1/release/*/*`
+    def teardown_repo(repos, pattern)
+      check_authorization
+      repos.each do |repo|
+        artifacts = Artifactory::Resource::Artifact.pattern_search(repo: repo, pattern: pattern)
+        artifacts.each do |artifact|
+          puts "Deleting #{artifact.download_uri}"
+          artifact.delete
+        end
+      end
+    end
+
+    # Remove promoted artifacts if promotion is reverted, use information provided in manifest
+    # @param manifest [File] JSON file containing information about what packages to download and the corresponding md5sums
+    # @param remote_path [String] path on artifactory to promoted packages ex. 2019.1/repos/
+    # @param package [String] package name ex. puppet-agent
+    # @param repos [Array] the repos the promoted artifacts live
+    def remove_promoted_packages(manifest, remote_path, package, repos)
+      check_authorization
+      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)
+          artifacts.each do |artifact|
+            next unless artifact.download_uri.include? remote_path
+            puts "Removing reverted package #{artifact.download_uri}"
+            artifact.delete
           end
         end
       end

data/lib/packaging/config.rb

@@ -99,7 +99,7 @@ module Pkg
             # beaker install the msi without having to know any version
             # information, but we should report the versioned artifact in
             # platform_data
-            next if platform == 'windows' && File.basename(artifact) == "#{self.project}-#{arch}.#{package_format}"
+            next if platform =~ /^windows.*$/ && File.basename(artifact) == "#{self.project}-#{arch}.#{package_format}"
 
             # Sometimes we have source or debug packages. We don't want to save
             # these paths in favor of the artifact paths.

data/lib/packaging/paths.rb

@@ -25,13 +25,15 @@ module Pkg::Paths
   # with the artifact and path
   def tag_from_artifact_path(path)
     platform = Pkg::Platforms.supported_platforms.find { |p| path =~ /(\/|\.)#{p}[^\.]/ }
+    platform = 'windowsfips' if path =~ /windowsfips/
+
     codename = Pkg::Platforms.codenames.find { |c| path =~ /\/#{c}/ }
 
     if codename
       platform, version = Pkg::Platforms.codename_to_platform_version(codename)
     end
 
-    version = '2012' if platform == 'windows'
+    version = '2012' if platform =~ /^windows.*$/
 
     version ||= Pkg::Platforms.versions_for_platform(platform).find { |v| path =~ /#{platform}(\/|-)?#{v}/ }
 
@@ -152,7 +154,7 @@ module Pkg::Paths
       if is_legacy_repo?(repo_name(nonfinal))
         [File.join(path_prefix, 'windows'), nil]
       else
-        [File.join(path_prefix, 'windows', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'windows', link_name(nonfinal))]
+        [File.join(path_prefix, platform, repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, platform, link_name(nonfinal))]
       end
     else
       raise "Not sure where to find packages with a package format of '#{package_format}'"
@@ -242,7 +244,7 @@ module Pkg::Paths
       if options[:legacy]
         File.join('repos', 'windows')
       else
-        File.join('repos', 'windows', repo_target)
+        File.join('repos', platform, repo_target)
       end
     else
       raise "Not sure what to do with a package format of '#{package_format}'"
@@ -300,4 +302,10 @@ module Pkg::Paths
       return nil
     end
   end
+
+  def two_digit_pe_version_from_path(path)
+    matches = path.match(/\d+\.\d+/)
+    fail "Error: Could not determine PE version from path #{path}" if matches.nil?
+    return matches[0]
+  end
 end

data/lib/packaging/platforms.rb

@@ -340,6 +340,13 @@ module Pkg
           repo: false,
         }
       },
+      'windowsfips' => {
+        '2012' => {
+          architectures: ['x64'],
+          package_format: 'msi',
+          repo: false,
+        }
+      },
     }.freeze
 
     # @return [Array] An array of Strings, containing all of the supported

data/lib/packaging/repo.rb

@@ -1,35 +1,108 @@
 module Pkg::Repo
 
   class << self
-    def create_signed_repo_archive(path_to_repo, name_of_archive, versioning)
+
+    ##
+    ## Construct a local_target based upon the versioning style
+    ##
+    def construct_local_target_path(project, versioning)
+      case versioning
+      when 'ref'
+        return File.join(project, Pkg::Config.ref)
+      when 'version'
+        return File.join(project, Pkg::Util::Version.dot_version)
+      else
+        fail "Error: Unknown versioning argument: #{versioning}"
+      end
+    end
+
+    ##
+    ## Put a single signed repo into a tarball stored in
+    ## 'pkg/<local_target>/<archive_name>.tar.gz'
+    ##
+    def create_signed_repo_archive(repo_location, archive_name, versioning)
       tar = Pkg::Util::Tool.check_tool('tar')
-      Dir.chdir("pkg") do
-        if versioning == 'ref'
-          local_target = File.join(Pkg::Config.project, Pkg::Config.ref)
-        elsif versioning == 'version'
-          local_target = File.join(Pkg::Config.project, Pkg::Util::Version.dot_version)
+
+      local_target = construct_local_target_path(Pkg::Config.project, versioning)
+
+      if Pkg::Util::File.empty_dir?(File.join('pkg', local_target, repo_location))
+        if ENV['FAIL_ON_MISSING_TARGET'] == "true"
+          raise "Error: missing packages under #{repo_location}"
         end
-        Dir.chdir(local_target) do
-          if Pkg::Util::File.empty_dir?(path_to_repo)
-            if ENV['FAIL_ON_MISSING_TARGET'] == "true"
-              raise "ERROR: missing packages under #{path_to_repo}"
-            else
-              warn "Skipping #{name_of_archive} because #{path_to_repo} has no files"
-            end
-          else
-            puts "Archiving #{path_to_repo} as #{name_of_archive}"
-            stdout, _, _ = Pkg::Util::Execution.capture3("#{tar} --owner=0 --group=0 --create --gzip --file #{File.join('repos', "#{name_of_archive}.tar.gz")} #{path_to_repo}")
-            stdout
-          end
+        warn "Warn: Skipping #{archive_name} because #{repo_location} has no files"
+        return
+      end
+
+      Dir.chdir(File.join('pkg', local_target)) do
+        puts "Info: Archiving #{repo_location} as #{archive_name}"
+        target_tarball = File.join('repos', "#{archive_name}.tar.gz")
+        tar_command = "#{tar} --owner=0 --group=0 --create --gzip --file #{target_tarball} #{repo_location}"
+        stdout, _, _ = Pkg::Util::Execution.capture3(tar_command)
+        return stdout
+      end
+    end
+
+    ##
+    ## Add a single repo tarball into the 'all' tarball located in
+    ## 'pkg/<local_target>/<project>-all.tar'
+    ## Create the 'all' tarball if needed.
+    ##
+    def update_tarball_of_all_repos(project, platform, versioning)
+      tar = Pkg::Util::Tool.check_tool('tar')
+
+      all_repos_tarball_name = "#{project}-all.tar"
+      archive_name = "#{project}-#{platform['name']}"
+      local_target = construct_local_target_path(project, versioning)
+      repo_tarball_name = "#{archive_name}.tar.gz"
+      repo_tarball_path = File.join('repos', repo_tarball_name)
+
+      Dir.chdir(File.join('pkg', local_target)) do
+        unless Pkg::Util::File.exist?(repo_tarball_path)
+          warn "Skipping #{archive_name} because it (#{repo_tarball_path}) contains no files"
+          next
+        end
+
+        tar_action = "--create"
+        if File.exist?(all_repos_tarball_name)
+          tar_action = "--update"
         end
+
+        tar_command = "#{tar} --owner=0 --group=0 #{tar_action} --file #{all_repos_tarball_name} #{repo_tarball_path}"
+        stdout, _, _ = Pkg::Util::Execution.capture3(tar_command)
+        puts stdout
       end
     end
 
+    ##
+    ## Invoke gzip to compress the 'all' tarball located in
+    ## 'pkg/<local_target>/<project>-all.tar'
+    ##
+    def compress_tarball_of_all_repos(all_repos_tarball_name)
+      gzip = Pkg::Util::Tool.check_tool('gzip')
+
+      gzip_command = "#{gzip} --fast #{all_repos_tarball_name}"
+      stdout, _, _ = Pkg::Util::Execution.capture3(gzip_command)
+      puts stdout
+    end
+
+    ##
+    ## Generate each of the repos listed in <Config.platform_repos>.
+    ## Update the 'all repos' tarball as we do each one.
+    ## Compress the 'all repos' tarball when all the repos have been generated
+    ##
     def create_all_repo_archives(project, versioning)
       platforms = Pkg::Config.platform_repos
+      local_target = construct_local_target_path(project, versioning)
+      all_repos_tarball_name = "#{project}-all.tar"
+
       platforms.each do |platform|
         archive_name = "#{project}-#{platform['name']}"
         create_signed_repo_archive(platform['repo_location'], archive_name, versioning)
+        update_tarball_of_all_repos(project, platform, versioning)
+      end
+
+      Dir.chdir(File.join('pkg', local_target)) do
+        compress_tarball_of_all_repos(all_repos_tarball_name)
       end
     end
 
@@ -40,7 +113,7 @@ module Pkg::Repo
       stdout, stderr = Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, cmd, true)
       return stdout.split
     rescue => e
-      fail "Could not retrieve directories that contain #{pkg_ext} packages in #{Pkg::Config.distribution_server}:#{artifact_directory}"
+      fail "Error: Could not retrieve directories that contain #{pkg_ext} packages in #{Pkg::Config.distribution_server}:#{artifact_directory}"
     end
 
     def populate_repo_directory(artifact_parent_directory)
@@ -49,7 +122,7 @@ module Pkg::Repo
       cmd << 'rsync --archive --verbose --one-file-system --ignore-existing artifacts/ repos/ '
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, cmd)
     rescue => e
-      fail "Could not populate repos directory in #{Pkg::Config.distribution_server}:#{artifact_parent_directory}"
+      fail "Error: Could not populate repos directory in #{Pkg::Config.distribution_server}:#{artifact_parent_directory}"
     end
 
     def argument_required?(argument_name, repo_command)
@@ -57,7 +130,7 @@ module Pkg::Repo
     end
 
     def update_repo(remote_host, command, options = {})
-      fail_message = "Missing required argument '%s', update your build_defaults?"
+      fail_message = "Error: Missing required argument '%s', update your build_defaults?"
       [:repo_name, :repo_path, :repo_host, :repo_url].each do |option|
         fail fail_message % option.to_s if argument_required?(option.to_s, command) && !options[option]
       end

data/lib/packaging/sign/msi.rb

@@ -9,7 +9,7 @@ module Pkg::Sign::Msi
 
     work_dir = "Windows/Temp/#{Pkg::Util.rand_string}"
     Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p C:/#{work_dir}")
-    msis = Dir.glob("#{target_dir}/windows/**/*.msi")
+    msis = Dir.glob("#{target_dir}/windows*/**/*.msi")
     Pkg::Util::Net.rsync_to(msis.join(" "), rsync_host_string, "/cygdrive/c/#{work_dir}")
 
     # Please Note:

data/spec/lib/packaging/artifactory_spec.rb

@@ -26,6 +26,11 @@ describe 'artifactory.rb' do
         :repo_config => '',
         :additional_artifacts => ["./windows/puppet-agent-extras-5.3.1.34-x86.msi"],
       },
+      'windowsfips-2012-x64' => {
+        :artifact => "./windowsfips/puppet-agent-5.3.1.34-x64.msi",
+        :repo_config => '',
+        :additional_artifacts => ["./windowsfips/puppet-agent-extras-5.3.1.34-x64.msi"],
+      },
       'eos-4-i386' => {
         :artifact => "./eos/4/PC1/i386/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix",
         :repo_config => '',
@@ -65,6 +70,12 @@ describe 'artifactory.rb' do
       :package_name => 'path/to/a/windows/package/puppet-agent-5.3.1.34-x86.msi',
       :all_package_names => ['puppet-agent-5.3.1.34-x86.msi','puppet-agent-extras-5.3.1.34-x86.msi']
     },
+    'windowsfips-2012-x64' => {
+      :toplevel_repo => 'generic',
+      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/windowsfips-x64",
+      :package_name => 'path/to/a/windowsfips/package/puppet-agent-5.3.1.34-x64.msi',
+      :all_package_names => ['puppet-agent-5.3.1.34-x64.msi','puppet-agent-extras-5.3.1.34-x64.msi']
+    },
     'eos-4-i386' => {
       :toplevel_repo => 'generic',
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/eos-4-i386",

data/spec/lib/packaging/config_spec.rb

@@ -232,7 +232,9 @@ describe "Pkg::Config" do
       "./artifacts/windows/puppet-agent-x64.msi\n" \
       "./artifacts/windows/puppet-agent-5.3.2-x86.wixpdb\n" \
       "./artifacts/windows/puppet-agent-5.3.2-x86.msi\n" \
-      "./artifacts/windows/puppet-agent-5.3.2-x64.msi"
+      "./artifacts/windows/puppet-agent-5.3.2-x64.msi\n"\
+      "./artifacts/windowsfips/puppet-agent-x64.msi\n" \
+      "./artifacts/windowsfips/puppet-agent-5.3.2-x64.msi"
 
     solaris_artifacts = \
       "./artifacts/solaris/11/PC1/puppet-agent@5.3.2,5.11-1.sparc.p5p\n" \
@@ -297,6 +299,7 @@ describe "Pkg::Config" do
       data = Pkg::Config.platform_data
       expect(data['windows-2012-x86']).to include(:artifact => './windows/puppet-agent-5.3.2-x86.msi')
       expect(data['windows-2012-x64']).to include(:artifact => './windows/puppet-agent-5.3.2-x64.msi')
+      expect(data['windowsfips-2012-x64']).to include(:artifact => './windowsfips/puppet-agent-5.3.2-x64.msi')
     end
 
     it "should not collect debug packages" do

data/spec/lib/packaging/platforms_spec.rb

@@ -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']
+      platforms = ['aix', 'cisco-wrlinux', 'cumulus', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
       expect(Pkg::Platforms.supported_platforms).to match_array(platforms)
     end
   end
@@ -127,6 +127,7 @@ describe 'Pkg::Platforms' do
     test_cases = {
       'debian-9-amd64' => ['debian', '9', 'amd64'],
       'windows-2012-x86' => ['windows', '2012', 'x86'],
+      'windowsfips-2012-x64' => ['windowsfips', '2012', 'x64'],
       'el-7-x86_64' => ['el', '7', 'x86_64'],
       'cisco-wrlinux-7-x86_64' => ['cisco-wrlinux', '7', 'x86_64'],
       'cisco-wrlinux-7' => ['cisco-wrlinux', '7', ''],

data/spec/lib/packaging/repo_spec.rb

@@ -16,46 +16,45 @@ describe "#Pkg::Repo" do
       allow(Pkg::Util::File).to receive(:empty_dir?).and_return(false)
       allow(Pkg::Util::Execution).to receive(:capture3)
 
-      expect(Dir).to receive(:chdir).with("pkg").and_yield
-      expect(Dir).to receive(:chdir).with("project/1.1.1").and_yield
+      expect(Dir).to receive(:chdir).with('pkg/project/1.1.1').and_yield
       Pkg::Repo.create_signed_repo_archive("/path", "project-debian-6-i386", "version")
     end
 
-    it "should use a ref if ref is specified as versioning" do
-      allow(Pkg::Util::Tool).to receive(:check_tool).and_return("tarcommand")
-      allow(Dir).to receive(:chdir).with("pkg").and_yield
+    it 'should use a ref if ref is specified as versioning' do
+      allow(Pkg::Util::Tool).to receive(:check_tool).and_return('tarcommand')
+      allow(Dir).to receive(:chdir).with('pkg').and_yield
       allow(Pkg::Util::File).to receive(:empty_dir?).and_return(false)
       allow(Pkg::Util::Execution).to receive(:capture3)
 
-      expect(Pkg::Config).to receive(:project).and_return("project")
-      expect(Pkg::Config).to receive(:ref).and_return("AAAAAAAAAAAAAAA")
-      expect(Dir).to receive(:chdir).with("project/AAAAAAAAAAAAAAA").and_yield
-      Pkg::Repo.create_signed_repo_archive("/path", "project-debian-6-i386", "ref")
+      expect(Pkg::Config).to receive(:project).and_return('project')
+      expect(Pkg::Config).to receive(:ref).and_return('AAAAAAAAAAAAAAA')
+      expect(Dir).to receive(:chdir).with('pkg/project/AAAAAAAAAAAAAAA').and_yield
+      Pkg::Repo.create_signed_repo_archive('/path', 'project-debian-6-i386', 'ref')
     end
 
-    it "should use dot versions if version is specified as versioning" do
-      allow(Pkg::Util::Tool).to receive(:check_tool).and_return("tarcommand")
-      allow(Dir).to receive(:chdir).with("pkg").and_yield
+    it 'should use dot versions if version is specified as versioning' do
+      allow(Pkg::Util::Tool).to receive(:check_tool).and_return('tarcommand')
+      allow(Dir).to receive(:chdir).with('pkg').and_yield
       allow(Pkg::Util::File).to receive(:empty_dir?).and_return(false)
       allow(Pkg::Util::Execution).to receive(:capture3)
 
-      expect(Pkg::Config).to receive(:project).and_return("project")
-      expect(Pkg::Util::Version).to receive(:dot_version).and_return("1.1.1")
-      expect(Dir).to receive(:chdir).with("project/1.1.1").and_yield
-      Pkg::Repo.create_signed_repo_archive("/path", "project-debian-6-i386", "version")
+      expect(Pkg::Config).to receive(:project).and_return('project')
+      expect(Pkg::Util::Version).to receive(:dot_version).and_return('1.1.1')
+      expect(Dir).to receive(:chdir).with('pkg/project/1.1.1').and_yield
+      Pkg::Repo.create_signed_repo_archive('/path', 'project-debian-6-i386', 'version')
     end
 
-    it "should fail if ENV['FAIL_ON_MISSING_TARGET'] is true and empty_dir? is also true" do
-      allow(Pkg::Util::Tool).to receive(:check_tool).and_return("tarcommand")
-      allow(Pkg::Config).to receive(:project).and_return("project")
-      allow(Pkg::Util::Version).to receive(:dot_version).and_return("1.1.1")
+    it 'should fail if ENV["FAIL_ON_MISSING_TARGET"] is true and empty_dir? is also true' do
+      allow(Pkg::Util::Tool).to receive(:check_tool).and_return('tarcommand')
+      allow(Pkg::Config).to receive(:project).and_return('project')
+      allow(Pkg::Util::Version).to receive(:dot_version).and_return('1.1.1')
       allow(Pkg::Util::Execution).to receive(:capture3)
-      allow(Dir).to receive(:chdir).with("pkg").and_yield
-      allow(Dir).to receive(:chdir).with("project/1.1.1").and_yield
+      allow(Dir).to receive(:chdir).with('pkg').and_yield
+      allow(Dir).to receive(:chdir).with('project/1.1.1').and_yield
       allow(Pkg::Util::File).to receive(:empty_dir?).and_return(true)
-      ENV['FAIL_ON_MISSING_TARGET'] = "true"
+      ENV['FAIL_ON_MISSING_TARGET'] = 'true'
 
-      expect{Pkg::Repo.create_signed_repo_archive("/path", "project-debian-6-i386", "version")}.to raise_error(RuntimeError, "ERROR: missing packages under /path")
+      expect{Pkg::Repo.create_signed_repo_archive('/path', 'project-debian-6-i386', 'version')}.to raise_error(RuntimeError, 'Error: missing packages under /path')
     end
 
     it "should only warn if ENV['FAIL_ON_MISSING_TARGET'] is false and empty_dir? is true" do
@@ -63,35 +62,38 @@ describe "#Pkg::Repo" do
       allow(Pkg::Config).to receive(:project).and_return("project")
       allow(Pkg::Util::Version).to receive(:dot_version).and_return("1.1.1")
       allow(Pkg::Util::Execution).to receive(:capture3)
-      allow(Dir).to receive(:chdir).with("pkg").and_yield
-      allow(Dir).to receive(:chdir).with("project/1.1.1").and_yield
+      allow(Dir).to receive(:chdir).with("pkg/project/1.1.1").and_yield
       allow(Pkg::Util::File).to receive(:empty_dir?).and_return(true)
       ENV['FAIL_ON_MISSING_TARGET'] = "false"
 
       expect{Pkg::Repo.create_signed_repo_archive("/path", "project-debian-6-i386", "version")}.not_to raise_error
     end
 
-    it "should invoke tar correctly" do
-      allow(Pkg::Util::Tool).to receive(:check_tool).and_return("tarcommand")
-      allow(Pkg::Config).to receive(:project).and_return("project")
-      allow(Pkg::Util::Version).to receive(:dot_version).and_return("1.1.1")
-      allow(Dir).to receive(:chdir).with("pkg").and_yield
-      allow(Dir).to receive(:chdir).with("project/1.1.1").and_yield
+    it 'should invoke tar correctly' do
+      allow(Pkg::Util::Tool).to receive(:check_tool).and_return('tarcommand')
+      allow(Pkg::Config).to receive(:project).and_return('project')
+      allow(Pkg::Util::Version).to receive(:dot_version).and_return('1.1.1')
+      allow(Dir).to receive(:chdir).with('pkg/project/1.1.1').and_yield
       allow(Pkg::Util::File).to receive(:empty_dir?).and_return(false)
 
-      expect(Pkg::Util::Execution).to receive(:capture3).with("tarcommand --owner=0 --group=0 --create --gzip --file repos/project-debian-6-i386.tar.gz /path")
-      Pkg::Repo.create_signed_repo_archive("/path", "project-debian-6-i386", "version")
+      expect(Pkg::Util::Execution).to receive(:capture3).with('tarcommand --owner=0 --group=0 --create --gzip --file repos/project-debian-6-i386.tar.gz /path')
+      Pkg::Repo.create_signed_repo_archive('/path', 'project-debian-6-i386', 'version')
     end
   end
 
-  describe "#create_signed_repo_archive" do
-    it "should invoke create_signed_repo_archive correctly for multiple entries in platform_repos" do
+  describe '#create_signed_repo_archive' do
+    it 'should invoke create_signed_repo_archive correctly for multiple entries in platform_repos' do
       allow(Pkg::Config).to receive(:platform_repos).and_return(platform_repo_stub)
+      allow(Pkg::Config).to receive(:project).and_return('project')
+      allow(Pkg::Util::Version).to receive(:dot_version).and_return('1.1.1')
+      allow(Dir).to receive(:chdir).with('pkg/project/1.1.1').and_yield
+
+      expect(Pkg::Repo).to receive(:create_signed_repo_archive).with('repos/el/4/**/i386', 'project-el-4-i386', 'version')
+      expect(Pkg::Repo).to receive(:create_signed_repo_archive).with('repos/el/5/**/i386', 'project-el-5-i386', 'version')
+      expect(Pkg::Repo).to receive(:create_signed_repo_archive).with('repos/el/6/**/i386', 'project-el-6-i386', 'version')
 
-      expect(Pkg::Repo).to receive(:create_signed_repo_archive).with("repos/el/4/**/i386", "project-el-4-i386", "version")
-      expect(Pkg::Repo).to receive(:create_signed_repo_archive).with("repos/el/5/**/i386", "project-el-5-i386", "version")
-      expect(Pkg::Repo).to receive(:create_signed_repo_archive).with("repos/el/6/**/i386", "project-el-6-i386", "version")
-      Pkg::Repo.create_all_repo_archives("project", "version")
+      allow(Pkg::Util::Execution).to receive(:capture3)
+      Pkg::Repo.create_all_repo_archives('project', 'version')
     end
   end
 

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

@@ -4,7 +4,9 @@ describe '#Pkg::Util::Ship' do
   describe '#collect_packages' do
     msi_pkgs = [
       'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
-      'pkg/windows/puppet5/puppet-agent-x86.msi'
+      'pkg/windows/puppet5/puppet-agent-x86.msi',
+      'pkg/windowsfips/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x64.msi',
+      'pkg/windowsfips/puppet5/puppet-agent-x64.msi'
     ]
     swix_pkgs = [
       'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
@@ -24,7 +26,13 @@ describe '#Pkg::Util::Ship' do
         expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi'])).not_to include('pkg/windows/puppet5/puppet-agent-x86.msi')
       end
       it 'correctly includes packages that do not match a passed excluded argument' do
-        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi'])).to include('pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi')
+        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi'])).to \
+          match_array(
+            [
+              'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
+              'pkg/windowsfips/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x64.msi',
+            ]
+          )
       end
     end
 

data/tasks/nightly_repos.rake

@@ -68,60 +68,6 @@ DOC
       Pkg::Repo.create_all_repo_archives(name_of_archive, versioning)
     end
 
-    # This is pretty similar to the 'pack_signed_repo' task. The difference here is that instead
-    # of creating a tarball for each repo passed, it adds each repo to a single archive, creating
-    # one 'all' tarball with all of the repos. This is useful for cutomers who have a PE master with
-    # no internet access. They can unpack the puppet-agent-all tarball into the location that
-    # pe_repo expects and use simplified agent install without needing internet access, or having to
-    # manually download each agent that they need to feed to pe_repo.
-    # This task should be invoked after prepare_signed_repos, so that there are repos to pack up.
-    task :pack_all_signed_repos, [:path_to_repo, :name_of_archive, :versioning] => ["pl:fetch"] do |t, args|
-      # path_to_repo should be relative to ./pkg
-      name_of_archive = args.name_of_archive or fail ":name_of_archive is a required argument for #{t}"
-      versioning = args.versioning or fail ":versioning is a required argument for #{t}"
-      tar = Pkg::Util::Tool.check_tool('tar')
-
-      Dir.chdir("pkg") do
-        if versioning == 'ref'
-          local_target = File.join(Pkg::Config.project, Pkg::Config.ref, "repos")
-        elsif versioning == 'version'
-          local_target = File.join(Pkg::Config.project, Pkg::Util::Version.dot_version, "repos")
-        end
-
-        Dir.chdir(local_target) do
-          if !Pkg::Util::File.exist?("#{name_of_archive}.tar.gz")
-            warn "Skipping #{name_of_archive} because it (#{name_of_archive}.tar.gz) has no files"
-          else
-            if File.exist?("#{Pkg::Config.project}-all.tar")
-              tar_cmd = "--update"
-            else
-              tar_cmd = "--create"
-            end
-            Pkg::Util::Execution.ex("#{tar} --owner=0 --group=0 #{tar_cmd} --file #{Pkg::Config.project}-all.tar #{name_of_archive}.tar.gz")
-          end
-        end
-      end
-    end
-
-    # tar does not support adding or updating files in a compressed archive, so
-    # we have a task to compress the "all" tarball from the 'pack_all_signed_repos'
-    # task
-    task :compress_the_all_tarball, [:versioning] => ["pl:fetch"] do |t, args|
-      versioning = args.versioning or fail ":versioning is a required argument for #{t}"
-      gzip = Pkg::Util::Tool.check_tool('gzip')
-      Dir.chdir("pkg") do
-        if versioning == 'ref'
-          local_target = File.join(Pkg::Config.project, Pkg::Config.ref)
-        elsif versioning == 'version'
-          local_target = File.join(Pkg::Config.project, Pkg::Util::Version.dot_version)
-        end
-        Dir.chdir(local_target) do
-          Pkg::Util::Execution.ex("#{gzip} --fast #{File.join("repos", "#{Pkg::Config.project}-all.tar")}")
-        end
-      end
-    end
-
-
     task :prepare_signed_repos, [:target_host, :target_prefix, :versioning] => ["clean", "pl:fetch"] do |t, args|
       target_host = args.target_host or fail ":target_host is a required argument to #{t}"
       target_prefix = args.target_prefix or fail ":target_prefix is a required argument for #{t}"

data/tasks/ship.rake

@@ -545,7 +545,9 @@ namespace :pl do
 
       local_dir = args.local_dir || 'pkg'
       Dir.glob("#{local_dir}/**/*").reject { |e| File.directory? e }.each do |artifact|
-        if artifactory.package_exists_on_artifactory?(artifact)
+        if File.extname(artifact) == ".yaml" || File.extname(artifact) == ".json"
+          artifactory.deploy_package(artifact)
+        elsif artifactory.package_exists_on_artifactory?(artifact)
           warn "Attempt to upload '#{artifact}' failed. Package already exists!"
         else
           artifactory.deploy_package(artifact)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.40
+  version: 0.99.45
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,14 +56,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
 - !ruby/object:Gem::Dependency
@@ -224,34 +224,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
+- spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/git_spec.rb
 - spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging_spec.rb