packaging 0.102.0 → 0.103.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8109d6dfa1a7f7e43f5ecf91242eef84cdf835e787332330edf69a72575964a
-  data.tar.gz: 3e7758f0d7aa68dda7ba93496fd3560d8a89fcadb90945009f3637bfe36df293
+  metadata.gz: 5f86a8438548dce924f97c559885a4b5d9c94bc88449717e8781d1639683efb4
+  data.tar.gz: 59ef7b771215acc69595e42f705ceca186f2467141ebda0a996ea8d52fc4945c
 SHA512:
-  metadata.gz: 6d6c20e9875ac5f178dd5fa1f819eb179d853e85097cc5ea322918ee57dfed229bd02fa8d4f89fd19db4a06a4633d13bde6103d69d524bbbb62af5f67461b90f
-  data.tar.gz: d8765d30cc28d2001766cc9705333594d14f39053e4a3fab9c38763be812ec7a4ceeb783c9c44593b9a6a0852129ebb391c5ec057cddfe250d7274524f5ed9d9
+  metadata.gz: b2609ced8514dce238e41345e024a1740f1dd4e62441a6f6be9ed91645fbc8db90151f8e367c9d86bc0e5907621589981f94a6cbeaea60e4ad97496b8f2c19ab
+  data.tar.gz: 1afba4a382a78490faee8e2f4b9974ea9ef80a9eec1a23c4733aaef86b8fe360902f440aea43daa307cf7eb84c3705db7d885ab7af2df948ebc5de1933956845

data/lib/packaging/config.rb

@@ -80,7 +80,7 @@ module Pkg
 
         dir = "/opt/jenkins-builds/#{self.project}/#{self.ref}"
         cmd = "if [ -s \"#{dir}/artifacts\" ]; then cd #{dir};"\
-              "find ./artifacts -mindepth 2 -type f; fi"
+              "find ./artifacts/ -mindepth 2 -type f; fi"
         artifacts, _ = Pkg::Util::Net.remote_execute(
                      self.builds_server,
                      cmd,
@@ -95,7 +95,6 @@ module Pkg
           # the correct place. For 5.x and 6.x release streams the f prefix
           # has been removed and so tag will equal original_tag
           original_tag = Pkg::Paths.tag_from_artifact_path(artifact)
-          fail "Error: unrecognized artifact \"#{artifact}\"" if original_tag.nil?
 
           # Remove the f-prefix from the fedora platform tag keys so that
           # beaker can rely on consistent keys once we rip out the f for good
@@ -204,18 +203,15 @@ module Pkg
       # string. Accept an argument for the write target file. If not specified,
       # the name of the params file is the current git commit sha or tag.
       #
-      def config_to_yaml(destination_directory = nil)
-        destination_directory = Pkg::Util::File.mktemp if destination_directory.nil?
-        config_yaml_file_name = "#{self.ref}.yaml"
-
-        config_yaml_path = File.join(destination_directory, config_yaml_file_name)
-
-        Pkg::Util::File.file_writable?(File.dirname(config_yaml_path), :required => true)
-        File.open(config_yaml_path, 'w') do |f|
+      def config_to_yaml(target = nil)
+        file = "#{self.ref}.yaml"
+        target = target.nil? ? File.join(Pkg::Util::File.mktemp, "#{self.ref}.yaml") : File.join(target, file)
+        Pkg::Util::File.file_writable?(File.dirname(target), :required => true)
+        File.open(target, 'w') do |f|
           f.puts self.config_to_hash.to_yaml
         end
-        puts config_yaml_path
-        return config_yaml_path
+        puts target
+        target
       end
 
       ##

data/lib/packaging/repo.rb

@@ -36,8 +36,7 @@ module Pkg::Repo
       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 = %W[#{tar} --owner=0 --group=0 --create --gzip
-          --file #{target_tarball} #{repo_location}].join(' ')
+        tar_command = "#{tar} --owner=0 --group=0 --create --gzip --file #{target_tarball} #{repo_location}"
         stdout, _, _ = Pkg::Util::Execution.capture3(tar_command)
         return stdout
       end
@@ -63,12 +62,12 @@ module Pkg::Repo
           next
         end
 
-        tar_action = '--create'
-        tar_action = '--update' if File.exist?(all_repos_tarball_name)
-
-        tar_command = %W[#{tar} --owner=0 --group=0 #{tar_action}
-          --file #{all_repos_tarball_name} #{repo_tarball_path}].join(' ')
+        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
@@ -118,8 +117,7 @@ module Pkg::Repo
               )
       return stdout.split
     rescue => e
-      fail "Error: Could not retrieve directories that contain #{pkg_ext} " \
-           "packages in #{Pkg::Config.distribution_server}:#{artifact_directory}: #{e}"
+      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)
@@ -128,8 +126,7 @@ module Pkg::Repo
       cmd << 'rsync --archive --verbose --one-file-system --ignore-existing artifacts/ repos/ '
       Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, cmd)
     rescue => e
-      fail "Error: Could not populate repos directory in " \
-           "#{Pkg::Config.distribution_server}:#{artifact_parent_directory}: #{e}"
+      fail "Error: Could not populate repos directory in #{Pkg::Config.distribution_server}:#{artifact_parent_directory}"
     end
 
     def argument_required?(argument_name, repo_command)
@@ -137,12 +134,12 @@ module Pkg::Repo
     end
 
     def update_repo(remote_host, command, options = {})
-      fail_message = "Error: Missing required argument '%s', perhaps update 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
 
-      repo_configuration = {
+      whitelist = {
         __REPO_NAME__: options[:repo_name],
         __REPO_PATH__: options[:repo_path],
         __REPO_HOST__: options[:repo_host],
@@ -152,7 +149,7 @@ module Pkg::Repo
       }
       Pkg::Util::Net.remote_execute(
         remote_host,
-        Pkg::Util::Misc.search_and_replace(command, repo_configuration))
+        Pkg::Util::Misc.search_and_replace(command, whitelist))
     end
   end
 end

data/lib/packaging/util/net.rb

@@ -159,7 +159,7 @@ module Pkg::Util::Net
       raise(ArgumentError, "Cannot sync path '#{origin}' because both origin_host and target_host are nil. Perhaps you need to set TEAM=release ?") unless
         options[:origin_host] || options[:target_host]
 
-      cmd = %W[
+      cmd = %W(
         #{options[:bin]}
         --recursive
         --hard-links
@@ -169,7 +169,7 @@ module Pkg::Util::Net
         --no-perms
         --no-owner
         --no-group
-      ] + [*options[:extra_flags]]
+      ) + [*options[:extra_flags]]
 
       cmd << '--dry-run' if options[:dryrun]
       cmd << Pkg::Util.pseudo_uri(path: origin, host: options[:origin_host])

data/lib/packaging/util/ship.rb

@@ -1,20 +1,14 @@
 # Module for shipping all packages to places
-
-require 'English'
 require 'tmpdir'
-
 module Pkg::Util::Ship
   module_function
 
-  def collect_packages(pkg_exts, excludes = [])
+  def collect_packages(pkg_exts, excludes = []) # rubocop:disable Metrics/MethodLength
     pkgs = pkg_exts.map { |ext| Dir.glob(ext) }.flatten
     return [] if pkgs.empty?
-
-    if excludes
-      excludes.each do |exclude|
-        pkgs.delete_if { |p| p.match(exclude) }
-      end
-    end
+    excludes.each do |exclude|
+      pkgs.delete_if { |p| p.match(exclude) }
+    end if excludes
     if pkgs.empty?
       $stdout.puts "No packages with (#{pkg_exts.join(', ')}) extensions found staged in 'pkg'"
       $stdout.puts "Maybe your excludes argument (#{excludes}) is too restrictive?"
@@ -65,13 +59,13 @@ module Pkg::Util::Ship
   #   false (most paths will be platform dependent), but set to true for gems
   #   and tarballs since those just land directly under /opt/downloads/<project>
   #
+  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def ship_pkgs(pkg_exts, staging_server, remote_path, opts = {})
     options = {
       excludes: [],
       chattr: true,
       platform_independent: false,
-      nonfinal: false
-    }.merge(opts)
+      nonfinal: false }.merge(opts)
 
     # First find the packages to be shipped. We must find them before moving
     # to our temporary staging directory
@@ -79,39 +73,35 @@ module Pkg::Util::Ship
     return false if local_packages.empty?
 
     tmpdir = Dir.mktmpdir
-    staged_pkgs = reorganize_packages(
-      local_packages, tmpdir, options[:platform_independent], options[:nonfinal]
-    )
+    staged_pkgs = reorganize_packages(local_packages, tmpdir, options[:platform_independent], options[:nonfinal])
 
     puts staged_pkgs.sort
     puts "Do you want to ship the above files to (#{staging_server})?"
-    return false unless Pkg::Util.ask_yes_or_no
-
-    extra_flags = %w(--ignore-existing --delay-updates)
-    extra_flags << '--dry-run' if ENV['DRYRUN']
-
-    staged_pkgs.each do |pkg|
-      Pkg::Util::Execution.retry_on_fail(times: 3) do
-        sub_string = 'pkg'
-        remote_pkg = pkg.sub(sub_string, remote_path)
-        remote_basepath = File.dirname(remote_pkg)
-        Pkg::Util::Net.remote_execute(staging_server, "mkdir -p #{remote_basepath}")
-        Pkg::Util::Net.rsync_to(
-          File.join(tmpdir, pkg),
-          staging_server,
-          remote_basepath,
-          extra_flags: extra_flags
-        )
-
-        Pkg::Util::Net.remote_set_ownership(
-          staging_server, 'root', 'release', [remote_basepath, remote_pkg]
-        )
-        Pkg::Util::Net.remote_set_permissions(staging_server, '775', [remote_basepath])
-        Pkg::Util::Net.remote_set_permissions(staging_server, '0664', [remote_pkg])
-        Pkg::Util::Net.remote_set_immutable(staging_server, [remote_pkg]) if options[:chattr]
+    if Pkg::Util.ask_yes_or_no
+      extra_flags = ['--ignore-existing', '--delay-updates']
+      extra_flags << '--dry-run' if ENV['DRYRUN']
+
+      staged_pkgs.each do |pkg|
+        Pkg::Util::Execution.retry_on_fail(times: 3) do
+          sub_string = 'pkg'
+          remote_pkg = pkg.sub(sub_string, remote_path)
+          remote_basepath = File.dirname(remote_pkg)
+          Pkg::Util::Net.remote_execute(staging_server, "mkdir -p #{remote_basepath}")
+          Pkg::Util::Net.rsync_to(
+            File.join(tmpdir, pkg),
+            staging_server,
+            remote_basepath,
+            extra_flags: extra_flags
+          )
+
+          Pkg::Util::Net.remote_set_ownership(staging_server, 'root', 'release', [remote_basepath, remote_pkg])
+          Pkg::Util::Net.remote_set_permissions(staging_server, '775', [remote_basepath])
+          Pkg::Util::Net.remote_set_permissions(staging_server, '0664', [remote_pkg])
+          Pkg::Util::Net.remote_set_immutable(staging_server, [remote_pkg]) if options[:chattr]
+        end
       end
+      return true
     end
-    return true
   end
 
   def ship_rpms(local_staging_directory, remote_path, opts = {})
@@ -133,8 +123,6 @@ module Pkg::Util::Ship
     ship_pkgs(things_to_ship, Pkg::Config.apt_signing_server, remote_path, opts)
   end
 
-
-
   def ship_svr4(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.pkg.gz"], Pkg::Config.svr4_host, remote_path, opts)
   end
@@ -144,63 +132,33 @@ module Pkg::Util::Ship
   end
 
   def ship_dmg(local_staging_directory, remote_path, opts = {})
-    packages_have_shipped = ship_pkgs(
-      ["#{local_staging_directory}/**/*.dmg"],
-      Pkg::Config.dmg_staging_server, remote_path, opts
-    )
-
-    return unless packages_have_shipped
-
-    Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
-      # Create the latest symlink for the current supported repo
-      Pkg::Util::Net.remote_create_latest_symlink(
-        Pkg::Config.project,
-        Pkg::Paths.artifacts_path(platform_tag, remote_path, opts[:nonfinal]),
-        'dmg'
-      )
+    packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.dmg"],
+                                      Pkg::Config.dmg_staging_server, remote_path, opts)
+
+    if packages_have_shipped
+      Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
+        # Create the latest symlink for the current supported repo
+        Pkg::Util::Net.remote_create_latest_symlink(
+          Pkg::Config.project,
+          Pkg::Paths.artifacts_path(platform_tag, remote_path, opts[:nonfinal]),
+          'dmg'
+        )
+      end
     end
   end
 
   def ship_swix(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(
-      ["#{local_staging_directory}/**/*.swix"],
-      Pkg::Config.swix_staging_server,
-      remote_path,
-      opts
-    )
+    ship_pkgs(["#{local_staging_directory}/**/*.swix"], Pkg::Config.swix_staging_server, remote_path, opts)
   end
 
   def ship_msi(local_staging_directory, remote_path, opts = {})
-    packages_have_shipped = ship_pkgs(
-      ["#{local_staging_directory}/**/*.msi"],
-      Pkg::Config.msi_staging_server,
-      remote_path,
-      opts
-    )
-    return unless packages_have_shipped
-
-    # Create the symlinks for the latest supported repo
-    Pkg::Util::Net.remote_create_latest_symlink(
-      Pkg::Config.project,
-      Pkg::Paths.artifacts_path(
-        Pkg::Platforms.generic_platform_tag('windows'),
-        remote_path,
-        opts[:nonfinal]
-      ),
-      'msi',
-      arch: 'x64'
-    )
+    packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.msi"], Pkg::Config.msi_staging_server, remote_path, opts)
 
-    Pkg::Util::Net.remote_create_latest_symlink(
-      Pkg::Config.project,
-      Pkg::Paths.artifacts_path(
-        Pkg::Platforms.generic_platform_tag('windows'),
-        remote_path,
-        opts[:nonfinal]
-      ),
-      'msi',
-      arch: 'x86'
-    )
+    if packages_have_shipped
+      # Create the symlinks for the latest supported repo
+      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path, opts[:nonfinal]), 'msi', arch: 'x64')
+      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path, opts[:nonfinal]), 'msi', arch: 'x86')
+    end
   end
 
   def ship_gem(local_staging_directory, remote_path, opts = {})
@@ -208,32 +166,44 @@ module Pkg::Util::Ship
   end
 
   def ship_tar(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(
-      ["#{local_staging_directory}/*.tar.gz*"],
-      Pkg::Config.tar_staging_server,
-      remote_path,
-      opts
-    )
+    ship_pkgs(["#{local_staging_directory}/*.tar.gz*"], Pkg::Config.tar_staging_server, remote_path, opts)
   end
 
   def rolling_repo_link_command(platform_tag, repo_path, nonfinal = false)
-    base_path, link_path = Pkg::Paths.artifacts_base_path_and_link_path(
-      platform_tag,
-      repo_path,
-      nonfinal
-    )
+    base_path, link_path = Pkg::Paths.artifacts_base_path_and_link_path(platform_tag, repo_path, nonfinal)
 
     if link_path.nil?
       puts "No link target set, not creating rolling repo link for #{base_path}"
       return nil
     end
+
+    cmd = <<-CMD
+      if [ ! -d #{base_path} ] ; then
+        echo "Link target '#{base_path}' does not exist; skipping"
+        exit 0
+      fi
+      # If it's a link but pointing to the wrong place, remove the link
+      # This is likely to happen around the transition times, like puppet5 -> puppet6
+      if [ -L #{link_path} ] && [ ! #{base_path} -ef #{link_path} ] ; then
+        rm #{link_path}
+      # This is the link you're looking for, nothing to see here
+      elif [ -L #{link_path} ] ; then
+        exit 0
+      # Don't want to delete it if it isn't a link, that could be destructive
+      # So, fail!
+      elif [ -e #{link_path} ] ; then
+        echo "#{link_path} exists but isn't a link, I don't know what to do with this" >&2
+        exit 1
+      fi
+      ln -s #{base_path} #{link_path}
+    CMD
   end
 
   def create_rolling_repo_link(platform_tag, staging_server, repo_path, nonfinal = false)
     command = rolling_repo_link_command(platform_tag, repo_path, nonfinal)
 
     Pkg::Util::Net.remote_execute(staging_server, command) unless command.nil?
-  rescue StandardError => e
+  rescue => e
     fail "Failed to create rolling repo link for '#{platform_tag}'.\n#{e}\n#{e.backtrace}"
   end
 
@@ -244,33 +214,10 @@ module Pkg::Util::Ship
     swix_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'swix')
     msi_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'msi')
 
-    create_rolling_repo_link(
-      Pkg::Platforms.generic_platform_tag('el'),
-      Pkg::Config.yum_staging_server,
-      yum_path,
-      nonfinal
-    )
-
-    create_rolling_repo_link(
-      Pkg::Platforms.generic_platform_tag('osx'),
-      Pkg::Config.dmg_staging_server,
-      dmg_path,
-      nonfinal
-    )
-
-    create_rolling_repo_link(
-      Pkg::Platforms.generic_platform_tag('eos'),
-      Pkg::Config.swix_staging_server,
-      swix_path,
-      nonfinal
-    )
-
-    create_rolling_repo_link(
-      Pkg::Platforms.generic_platform_tag('windows'),
-      Pkg::Config.msi_staging_server,
-      msi_path,
-      nonfinal
-    )
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('el'), Pkg::Config.yum_staging_server, yum_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, dmg_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('eos'), Pkg::Config.swix_staging_server, swix_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, msi_path, nonfinal)
 
     # We need to iterate through all the supported platforms here because of
     # how deb repos are set up. Each codename will have its own link from the
@@ -284,12 +231,7 @@ module Pkg::Util::Ship
       apt_path = Pkg::Config.nonfinal_apt_repo_staging_path
     end
     Pkg::Platforms.codenames.each do |codename|
-      create_rolling_repo_link(
-        Pkg::Platforms.codename_to_tags(codename)[0],
-        Pkg::Config.apt_signing_server,
-        apt_path,
-        nonfinal
-      )
+      create_rolling_repo_link(Pkg::Platforms.codename_to_tags(codename)[0], Pkg::Config.apt_signing_server, apt_path, nonfinal)
     end
   end
 

data/lib/packaging/util.rb

@@ -4,12 +4,8 @@ module Pkg::Util
   require 'benchmark'
   require 'base64'
   require 'io/console'
-  require 'packaging/util/apt_staging_server'
-  require 'packaging/util/build_metadata'
   require 'packaging/util/date'
-  require 'packaging/util/distribution_server'
   require 'packaging/util/execution'
-  require 'packaging/util/ezbake'
   require 'packaging/util/file'
   require 'packaging/util/git'
   require 'packaging/util/gpg'
@@ -23,7 +19,6 @@ module Pkg::Util
   require 'packaging/util/tool'
   require 'packaging/util/rake_utils'
   require 'packaging/util/version'
-  require 'packaging/util/windows'
   require 'packaging/util/git_tags'
 
   def self.boolean_value(var)

data/tasks/jenkins.rake

@@ -286,7 +286,7 @@ namespace :pl do
         ship_nightly_msi
       )
       tasks.map { |t| "pl:#{t}" }.each do |t|
-        puts "Running #{t}:"
+        puts "Running #{t} . . ."
         Rake::Task[t].invoke
       end
     end

data/tasks/ship.rake

@@ -1,77 +1,44 @@
 namespace :pl do
   namespace :remote do
-    # Repo updates are the ways we convince the various repos to regenerate any repo-based
-    # metadata.
-    #
-    # It is broken up into various pieces and types to try to avoid too much redundant
-    # behavior.
+    # These hacky bits execute a pre-existing rake task on the Pkg::Config.apt_host
+    # The rake task takes packages in a specific directory and freights them
+    # to various target yum and apt repositories based on their specific type
+    # e.g., final vs devel vs PE vs FOSS packages
 
     desc "Update '#{Pkg::Config.repo_name}' yum repository on '#{Pkg::Config.yum_staging_server}'"
     task update_yum_repo: 'pl:fetch' do
       command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository/Rakefile mk_repo'
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
-      next unless Pkg::Util.ask_yes_or_no
-
-      Pkg::Repo.update_repo(
-        Pkg::Config.yum_staging_server,
-        command,
-        {
-          repo_name: Pkg::Paths.yum_repo_name,
-          repo_path: Pkg::Config.yum_repo_path,
-          repo_host: Pkg::Config.yum_staging_server
-        }
-      )
+      if Pkg::Util.ask_yes_or_no
+        Pkg::Repo.update_repo(Pkg::Config.yum_staging_server, command, { :repo_name => Pkg::Paths.yum_repo_name, :repo_path => Pkg::Config.yum_repo_path, :repo_host => Pkg::Config.yum_staging_server })
+      end
     end
 
     desc "Update all final yum repositories on '#{Pkg::Config.yum_staging_server}'"
     task update_all_final_yum_repos: 'pl:fetch' do
       command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository/Rakefile mk_repo'
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
-      next unless Pkg::Util.ask_yes_or_no
-
-      Pkg::Repo.update_repo(
-        Pkg::Config.yum_staging_server,
-        command,
-        {
-          repo_name: '',
-          repo_path: Pkg::Config.yum_repo_path,
-          repo_host: Pkg::Config.yum_staging_server
-        }
-      )
+      if Pkg::Util.ask_yes_or_no
+        Pkg::Repo.update_repo(Pkg::Config.yum_staging_server, command, { :repo_name => '', :repo_path => Pkg::Config.yum_repo_path, :repo_host => Pkg::Config.yum_staging_server })
+      end
     end
 
     desc "Update '#{Pkg::Config.nonfinal_repo_name}' nightly yum repository on '#{Pkg::Config.yum_staging_server}'"
     task update_nightlies_yum_repo: 'pl:fetch' do
       command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository-nightlies/Rakefile mk_repo'
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
-      next unless Pkg::Util.ask_yes_or_no
-
-      Pkg::Repo.update_repo(
-        Pkg::Config.yum_staging_server,
-        command,
-        {
-          repo_name: Pkg::Config.nonfinal_repo_name,
-          repo_path: Pkg::Config.nonfinal_yum_repo_path,
-          repo_host: Pkg::Config.yum_staging_server
-        }
-      )
+      if Pkg::Util.ask_yes_or_no
+        Pkg::Repo.update_repo(Pkg::Config.yum_staging_server, command, { :repo_name => Pkg::Config.nonfinal_repo_name, :repo_path => Pkg::Config.nonfinal_yum_repo_path, :repo_host => Pkg::Config.yum_staging_server })
+      end
     end
 
     desc "Update all nightly yum repositories on '#{Pkg::Config.yum_staging_server}'"
     task update_all_nightlies_yum_repos: 'pl:fetch' do
       command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository-nightlies/Rakefile mk_repo'
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
-      next unless Pkg::Util.ask_yes_or_no
-
-      Pkg::Repo.update_repo(
-        Pkg::Config.yum_staging_server,
-        command,
-        {
-          repo_name: '',
-          repo_path: Pkg::Config.nonfinal_yum_repo_path,
-          repo_host: Pkg::Config.yum_staging_server
-        }
-      )
+      if Pkg::Util.ask_yes_or_no
+        Pkg::Repo.update_repo(Pkg::Config.yum_staging_server, command, { :repo_name => '', :repo_path => Pkg::Config.nonfinal_yum_repo_path, :repo_host => Pkg::Config.yum_staging_server })
+      end
     end
 
     task freight: :update_apt_repo
@@ -79,35 +46,17 @@ namespace :pl do
     desc "Update remote apt repository on '#{Pkg::Config.apt_signing_server}'"
     task update_apt_repo: 'pl:fetch' do
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.apt_signing_server}'? [y,n]"
-      next unless Pkg::Util.ask_yes_or_no
-
-      Pkg::Repo.update_repo(
-        Pkg::Config.apt_signing_server,
-        Pkg::Config.apt_repo_command,
-        {
-          repo_name: Pkg::Paths.apt_repo_name,
-          repo_path: Pkg::Config.apt_repo_path,
-          repo_host: Pkg::Config.apt_host,
-          repo_url: Pkg::Config.apt_repo_url
-        }
-      )
+      if Pkg::Util.ask_yes_or_no
+        Pkg::Repo.update_repo(Pkg::Config.apt_signing_server, Pkg::Config.apt_repo_command, { :repo_name => Pkg::Paths.apt_repo_name, :repo_path => Pkg::Config.apt_repo_path, :repo_host => Pkg::Config.apt_host, :repo_url => Pkg::Config.apt_repo_url })
+      end
     end
 
     desc "Update nightlies apt repository on '#{Pkg::Config.apt_signing_server}'"
     task update_nightlies_apt_repo: 'pl:fetch' do
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.apt_signing_server}'? [y,n]"
-      next unless Pkg::Util.ask_yes_or_no
-
-      Pkg::Repo.update_repo(
-        Pkg::Config.apt_signing_server,
-        Pkg::Config.nonfinal_apt_repo_command,
-        {
-          repo_name: Pkg::Config.nonfinal_repo_name,
-          repo_path: Pkg::Config.nonfinal_apt_repo_path,
-          repo_host: Pkg::Config.apt_host,
-          repo_url: Pkg::Config.apt_repo_url
-        }
-      )
+      if Pkg::Util.ask_yes_or_no
+        Pkg::Repo.update_repo(Pkg::Config.apt_signing_server, Pkg::Config.nonfinal_apt_repo_command, { :repo_name => Pkg::Config.nonfinal_repo_name, :repo_path => Pkg::Config.nonfinal_apt_repo_path, :repo_host => Pkg::Config.apt_host, :repo_url => Pkg::Config.apt_repo_url })
+      end
     end
 
     desc "Update apt and yum repos"
@@ -125,31 +74,32 @@ namespace :pl do
     desc "Update remote ips repository on #{Pkg::Config.ips_host}"
     task :update_ips_repo  => 'pl:fetch' do
       if Dir['pkg/ips/pkgs/**/*'].empty? && Dir['pkg/solaris/11/**/*'].empty?
-        $stdout.puts "Error: there aren't any p5p packages in pkg/ips/pkgs or pkg/solaris/11."
-        next
-      end
+        $stdout.puts "There aren't any p5p packages in pkg/ips/pkgs or pkg/solaris/11. Maybe something went wrong?"
+      else
 
-      source_dir = 'pkg/solaris/11/'
-      source_dir = 'pkg/ips/pkgs/' unless Dir['pkg/ips/pkgs/**/*'].empty?
+        if !Dir['pkg/ips/pkgs/**/*'].empty?
+          source_dir = 'pkg/ips/pkgs/'
+        else
+          source_dir = 'pkg/solaris/11/'
+        end
 
-      tmpdir, _ = Pkg::Util::Net.remote_execute(
-                Pkg::Config.ips_host,
-                'mktemp -d -p /var/tmp',
-                { capture_output: true }
-              )
-      tmpdir.chomp!
+        tmpdir, _ = Pkg::Util::Net.remote_execute(
+                  Pkg::Config.ips_host,
+                  'mktemp -d -p /var/tmp',
+                  { capture_output: true }
+                )
+        tmpdir.chomp!
 
-      Pkg::Util::Net.rsync_to(source_dir, Pkg::Config.ips_host, tmpdir)
+        Pkg::Util::Net.rsync_to(source_dir, Pkg::Config.ips_host, tmpdir)
 
-      remote_cmd = %(for pkg in #{tmpdir}/*.p5p; do
-        sudo pkgrecv -s $pkg -d #{Pkg::Config.ips_path} '*';
+        remote_cmd = %(for pkg in #{tmpdir}/*.p5p; do
+      sudo pkgrecv -s $pkg -d #{Pkg::Config.ips_path} '*';
       done)
 
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, remote_cmd)
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host,
-        "sudo pkgrepo refresh -s #{Pkg::Config.ips_path}")
-      Pkg::Util::Net.remote_execute(Pkg::Config.ips_host,
-        "sudo /usr/sbin/svcadm restart svc:/application/pkg/server:#{Pkg::Config.ips_repo || 'default'}")
+        Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, remote_cmd)
+        Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, "sudo pkgrepo refresh -s #{Pkg::Config.ips_path}")
+        Pkg::Util::Net.remote_execute(Pkg::Config.ips_host, "sudo /usr/sbin/svcadm restart svc:/application/pkg/server:#{Pkg::Config.ips_repo || 'default'}")
+      end
     end
 
     desc "Move dmg repos from #{Pkg::Config.dmg_staging_server} to #{Pkg::Config.dmg_host}"
@@ -285,7 +235,6 @@ namespace :pl do
 
     desc "Sync signed apt repos from #{Pkg::Config.apt_signing_server} to Google Cloud Platform"
     task :sync_apt_repo_to_gcp => 'pl:fetch' do
-      ssh = Pkg::Util::Tool.check_tool('ssh')
       target_site = 'apt.repos.puppetlabs.com'
       sync_command_puppet_6 = "#{GCP_REPO_SYNC} apt.repos.puppet.com puppet6"
       sync_command_puppet_7 = "#{GCP_REPO_SYNC} apt.repos.puppet.com puppet7"
@@ -294,11 +243,8 @@ namespace :pl do
       puts
 
       Pkg::Util::Execution.retry_on_fail(times: 3) do
-        %x(#{ssh} #{Pkg::Config.apt_signing_server} '/bin/bash -l -c "#{sync_command_puppet_6}"')
-      end
-
-      Pkg::Util::Execution.retry_on_fail(times: 3) do
-        %x(#{ssh} #{Pkg::Config.apt_signing_server} '/bin/bash -l -c "#{sync_command_puppet_7}"')
+        Pkg::Util::Net.remote_execute(Pkg::Config.apt_signing_server, sync_command_puppet_6)
+        Pkg::Util::Net.remote_execute(Pkg::Config.apt_signing_server, sync_command_puppet_7)
       end
     end
     # Keep 'deploy' for backward compatibility
@@ -346,13 +292,6 @@ namespace :pl do
     end
   end
 
-  ##
-  ## Here's where we start 'shipping' (old terminology) or 'staging' (current terminology)
-  ## by copying local 'pkg' directories to the staging server.
-  ##
-  ## Note, that for debs, we conflate 'staging server' with 'signing server' because we
-  ## must stage in th place where we sign.
-  ##
   desc "Ship mocked rpms to #{Pkg::Config.yum_staging_server}"
   task ship_rpms: 'pl:fetch' do
     Pkg::Util::Ship.ship_rpms('pkg', Pkg::Config.yum_repo_path)
@@ -363,7 +302,6 @@ namespace :pl do
     Pkg::Util::Ship.ship_rpms('pkg', Pkg::Config.nonfinal_yum_repo_path, nonfinal: true)
   end
 
-  ## This is the old-style deb shipping
   desc "Ship cow-built debs to #{Pkg::Config.apt_signing_server}"
   task ship_debs: 'pl:fetch' do
     Pkg::Util::Ship.ship_debs('pkg', Pkg::Config.apt_repo_staging_path, chattr: false)
@@ -371,20 +309,7 @@ namespace :pl do
 
   desc "Ship nightly debs to #{Pkg::Config.apt_signing_server}"
   task ship_nightly_debs: 'pl:fetch' do
-    Pkg::Util::Ship.ship_debs(
-      'pkg', Pkg::Config.nonfinal_apt_repo_staging_path, chattr: false, nonfinal: true)
-  end
-
-  ## This is the new-style apt stager
-  desc "Stage debs to #{Pkg::Config.apt_signing_server}"
-  task stage_stable_debs: 'pl:fetch' do
-    Pkg::Util::AptStagingServer.send_packages('pkg', 'stable')
-  end
-  task stage_debs: :stage_stable_debs
-
-  desc "Stage nightly debs to #{Pkg::Config.apt_signing_server}"
-  task stage_nightly_debs: 'pl:fetch' do
-    Pkg::Util::AptStagingServer.send_packages('pkg', 'nightly')
+    Pkg::Util::Ship.ship_debs('pkg', Pkg::Config.nonfinal_apt_repo_staging_path, chattr: false, nonfinal: true)
   end
 
   desc 'Ship built gem to rubygems.org, internal Gem mirror, and public file server'
@@ -400,13 +325,12 @@ namespace :pl do
           puts 'This will ship to an internal gem mirror, a public file server, and rubygems.org'
           puts "Do you want to start shipping the rubygem '#{gem_file}'?"
           next unless Pkg::Util.ask_yes_or_no
-
           Rake::Task['pl:ship_gem_to_rubygems'].execute(file: gem_file)
         end
 
         Rake::Task['pl:ship_gem_to_downloads'].invoke
       else
-        warn 'Not shipping development gem using odd_even strategy for the sake of your users.'
+        $stderr.puts 'Not shipping development gem using odd_even strategy for the sake of your users.'
       end
     end
   end
@@ -418,7 +342,6 @@ namespace :pl do
     if Pkg::Config.build_gem
       fail 'Value `Pkg::Config.gem_host` not defined, skipping nightly ship' unless Pkg::Config.gem_host
       fail 'Value `Pkg::Config.nonfinal_gem_path` not defined, skipping nightly ship' unless Pkg::Config.nonfinal_gem_path
-
       FileList['pkg/*.gem'].each do |gem_file|
         Pkg::Gem.ship_to_internal_mirror(gem_file)
       end
@@ -528,25 +451,22 @@ namespace :pl do
 
   desc 'UBER ship: ship all the things in pkg'
   task uber_ship: 'pl:fetch' do
-    unless Pkg::Util.confirm_ship(FileList['pkg/**/*'])
+    if Pkg::Util.confirm_ship(FileList['pkg/**/*'])
+      Rake::Task['pl:ship_rpms'].invoke
+      Rake::Task['pl:ship_debs'].invoke
+      Rake::Task['pl:ship_dmg'].invoke
+      Rake::Task['pl:ship_swix'].invoke
+      Rake::Task['pl:ship_nuget'].invoke
+      Rake::Task['pl:ship_tar'].invoke
+      Rake::Task['pl:ship_svr4'].invoke
+      Rake::Task['pl:ship_p5p'].invoke
+      Rake::Task['pl:ship_msi'].invoke
+      add_shipped_metrics(pe_version: ENV['PE_VER'], is_rc: !Pkg::Util::Version.final?) if Pkg::Config.benchmark
+      post_shipped_metrics if Pkg::Config.benchmark
+    else
       puts 'Ship canceled'
       exit
     end
-
-    Rake::Task['pl:ship_rpms'].invoke
-    Rake::Task['pl:ship_debs'].invoke
-    Rake::Task['pl:ship_dmg'].invoke
-    Rake::Task['pl:ship_swix'].invoke
-    Rake::Task['pl:ship_nuget'].invoke
-    Rake::Task['pl:ship_tar'].invoke
-    Rake::Task['pl:ship_svr4'].invoke
-    Rake::Task['pl:ship_p5p'].invoke
-    Rake::Task['pl:ship_msi'].invoke
-
-    if Pkg::Config.benchmark
-      add_shipped_metrics(pe_version: ENV['PE_VER'], is_rc: !Pkg::Util::Version.final?)
-      post_shipped_metrics
-    end
   end
 
   desc 'Create the rolling repo links'
@@ -610,7 +530,7 @@ namespace :pl do
           { extra_options: '-oBatchMode=yes' }
         )
       end
-    rescue StandardError
+    rescue
       errs << "Unlocking the OSX keychain failed! Check the password in your .bashrc on #{Pkg::Config.osx_signing_server}"
     end
 
@@ -649,56 +569,66 @@ namespace :pl do
     task :ship_to_artifactory, :local_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')
       unless Pkg::Config.project
-        fail "Error: 'project' must be set in build_defaults.yaml or " \
-             "in the 'PROJECT_OVERRIDE' environment variable."
+        fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT_OVERRIDE' environment variable."
       end
-
       artifactory = Pkg::ManageArtifactory.new(Pkg::Config.project, Pkg::Config.ref)
 
       local_dir = args.local_dir || 'pkg'
-      Dir.glob("#{local_dir}/**/*").reject { |e| File.directory? e }.each do |artifact|
-        # Always deploy yamls and jsons
-        if artifact.end_with?('.yaml', '.json')
-          artifactory.deploy_package(artifact)
-          next
+      artifacts = Dir.glob("#{local_dir}/**/*").reject { |e| File.directory? e }
+      artifacts.sort! do |a, b|
+        if File.extname(a) =~ /(md5|sha\d+)/ && File.extname(b) !~ /(md5|sha\d+)/
+          1
+        elsif File.extname(b) =~ /(md5|sha\d+)/ && File.extname(a) !~ /(md5|sha\d+)/
+          -1
+        else
+          a <=> b
         end
-
-        # Don't deploy if the package already exists
-        if artifactory.package_exists_on_artifactory?(artifact)
-          warn "Attempt to upload '#{artifact}' failed. Package already exists."
-          next
+      end
+      artifacts.each do |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)
         end
-
-        artifactory.deploy_package(artifact)
       end
     end
 
-    desc 'Ship "pkg" directory contents to distribution server'
+    desc 'Ship pkg directory contents to distribution server'
     task :ship, :target, :local_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')
       unless Pkg::Config.project
-        fail "Error: 'project' must be set in build_defaults.yaml or " \
-             "in the 'PROJECT_OVERRIDE' environment variable."
+        fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT_OVERRIDE' environment variable."
       end
-
       target = args.target || 'artifacts'
       local_dir = args.local_dir || 'pkg'
-      project_basedir = File.join(
-        Pkg::Config.jenkins_repo_path, Pkg::Config.project, Pkg::Config.ref
-      )
-      artifact_dir = File.join(project_basedir, target)
+      project_basedir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}"
+      artifact_dir = "#{project_basedir}/#{target}"
 
       # For EZBake builds, we also want to include the ezbake.manifest file to
       # get a snapshot of this build and all dependencies. We eventually will
       # create a yaml version of this file, but until that point we want to
       # make the original ezbake.manifest available
-      Pkg::Util::EZbake.add_manifest(local_dir)
+      #
+      ezbake_manifest = File.join('ext', 'ezbake.manifest')
+      if File.exist?(ezbake_manifest)
+        cp(ezbake_manifest, File.join(local_dir, "#{Pkg::Config.ref}.ezbake.manifest"))
+      end
+      ezbake_yaml = File.join("ext", "ezbake.manifest.yaml")
+      if File.exists?(ezbake_yaml)
+        cp(ezbake_yaml, File.join(local_dir, "#{Pkg::Config.ref}.ezbake.manifest.yaml"))
+      end
 
       # Inside build_metadata*.json files there is additional metadata containing
       # information such as git ref and dependencies that are needed at build
       # time. If these files exist, copy them downstream.
       # Typically these files are named 'ext/build_metadata.<project>.<platform>.json'
-      Pkg::Util::BuildMetadata.add_misc_json_files(local_dir)
+      build_metadata_json_files = Dir.glob('ext/build_metadata*.json')
+      build_metadata_json_files.each do |source_file|
+        target_file = File.join(local_dir, "#{Pkg::Config.ref}.#{File.basename(source_file)}")
+        cp(source_file, target_file)
+      end
 
       # Sadly, the packaging repo cannot yet act on its own, without living
       # inside of a packaging-repo compatible project. This means in order to
@@ -734,11 +664,54 @@ namespace :pl do
       # and if the source package exists before linking. Searching for the
       # packages has been restricted specifically to just the pkg/windows dir
       # on purpose, as this is where we currently have all windows packages
-      # building to.
-      Pkg::Util::Windows.add_msi_links(local_dir)
+      # building to. Once we move the Metadata about the output location in
+      # to one source of truth we can refactor this to use that to search
+      #                                           -Sean P. M. 08/12/16
+
+      {
+        'windows' => ['x86', 'x64'],
+        'windowsfips' => ['x64']
+      }.each_pair do |platform, archs|
+        packages = Dir["#{local_dir}/#{platform}/*"]
+
+        archs.each do |arch|
+          package_version = Pkg::Util::Git.describe.tr('-', '.')
+          package_filename = File.join(local_dir, platform, "#{Pkg::Config.project}-#{package_version}-#{arch}.msi")
+          link_filename = File.join(local_dir, platform, "#{Pkg::Config.project}-#{arch}.msi")
+
+          next unless !packages.include?(link_filename) && packages.include?(package_filename)
+          # Dear future code spelunkers:
+          # Using symlinks instead of hard links causes failures when we try
+          # to set these files to be immutable. Also be wary of whether the
+          # linking utility you're using expects the source path to be relative
+          # to the link target or pwd.
+          #
+          FileUtils.ln(package_filename, link_filename)
+        end
+      end
+
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir --mode=775 -p #{project_basedir}")
+        Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{artifact_dir}")
+        Pkg::Util::Net.rsync_to("#{local_dir}/", Pkg::Config.distribution_server, "#{artifact_dir}/", extra_flags: ['--ignore-existing', '--exclude repo_configs'])
+      end
+
+      # In order to get a snapshot of what this build looked like at the time
+      # of shipping, we also generate and ship the params file
+      #
+      Pkg::Config.config_to_yaml(local_dir)
+      Pkg::Util::Execution.retry_on_fail(:times => 3) do
+        Pkg::Util::Net.rsync_to("#{local_dir}/#{Pkg::Config.ref}.yaml", Pkg::Config.distribution_server, "#{artifact_dir}/", extra_flags: ["--exclude repo_configs"])
+      end
+
+      # If we just shipped a tagged version, we want to make it immutable
+      files = Dir.glob("#{local_dir}/**/*").select { |f| File.file?(f) and !f.include? "#{Pkg::Config.ref}.yaml" }.map do |file|
+        "#{artifact_dir}/#{file.sub(/^#{local_dir}\//, '')}"
+      end
 
-      # Send packages to the distribution server.
-      Pkg::Util::DistributionServer.send_packages(local_dir, artifact_dir)
+      Pkg::Util::Net.remote_set_ownership(Pkg::Config.distribution_server, 'root', 'release', files)
+      Pkg::Util::Net.remote_set_permissions(Pkg::Config.distribution_server, '0664', files)
+      Pkg::Util::Net.remote_set_immutable(Pkg::Config.distribution_server, files)
     end
 
     desc 'Ship generated repository configs to the distribution server'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.102.0
+  version: 0.103.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: apt_stage_artifacts
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: artifactory
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: csv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: release-metrics
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 3.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 3.1.5
 description: Packaging automation written in Rake and Ruby. Easily build native packages
   for most platforms with a few data files and git.
 email: info@puppetlabs.com
@@ -172,12 +144,8 @@ files:
 - lib/packaging/sign/rpm.rb
 - lib/packaging/tar.rb
 - lib/packaging/util.rb
-- lib/packaging/util/apt_staging_server.rb
-- lib/packaging/util/build_metadata.rb
 - lib/packaging/util/date.rb
-- lib/packaging/util/distribution_server.rb
 - lib/packaging/util/execution.rb
-- lib/packaging/util/ezbake.rb
 - lib/packaging/util/file.rb
 - lib/packaging/util/git.rb
 - lib/packaging/util/git_tags.rb
@@ -192,7 +160,6 @@ files:
 - lib/packaging/util/ship.rb
 - lib/packaging/util/tool.rb
 - lib/packaging/util/version.rb
-- lib/packaging/util/windows.rb
 - spec/fixtures/config/ext/build_defaults.yaml
 - spec/fixtures/config/ext/project_data.yaml
 - spec/fixtures/configs/components/test_file.json
@@ -281,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/packaging/util/apt_staging_server.rb

@@ -1,8 +0,0 @@
-# Utility methods for handling Apt staging server.
-
-module Pkg::Util::AptStagingServer
-  def self.send_packages(pkg_directory, apt_component = 'stable')
-    %x(apt-stage-artifacts --component=#{apt_component} #{pkg_directory})
-    fail 'APT artifact staging failed.' unless $CHILD_STATUS.success?
-  end
-end

data/lib/packaging/util/build_metadata.rb

@@ -1,17 +0,0 @@
-# Utility methods for handling miscellaneous build metadata
-
-require 'fileutils'
-
-module Pkg::Util::BuildMetadata
-  class << self
-    def add_misc_json_files(target_directory)
-      misc_json_files = Dir.glob('ext/build_metadata*.json')
-      misc_json_files.each do |source_file|
-        target_file = File.join(
-          target_directory, "#{Pkg::Config.ref}.#{File.basename(source_file)}"
-        )
-        FileUtils.cp(source_file, target_file)
-      end
-    end
-  end
-end

data/lib/packaging/util/distribution_server.rb

@@ -1,42 +0,0 @@
-# Utility methods for the older distribution server
-
-require 'fileutils'
-
-module Pkg::Util::DistributionServer
-  class << self
-    def send_packages(local_source_directory, remote_target_directory)
-      Pkg::Util::Execution.retry_on_fail(times: 3) do
-        Pkg::Util::Net.remote_execute(
-          Pkg::Config.distribution_server,
-          "mkdir --mode=775 --parents #{remote_target_directory}"
-        )
-        Pkg::Util::Net.rsync_to(
-          "#{local_source_directory}/",
-          Pkg::Config.distribution_server, "#{remote_target_directory}/",
-          extra_flags: ['--ignore-existing', '--exclude repo_configs']
-        )
-      end
-
-      # In order to get a snapshot of what this build looked like at the time
-      # of shipping, we also generate and ship the params file
-      #
-      Pkg::Config.config_to_yaml(local_source_directory)
-      Pkg::Util::Execution.retry_on_fail(times: 3) do
-        Pkg::Util::Net.rsync_to(
-          "#{local_source_directory}/#{Pkg::Config.ref}.yaml",
-          Pkg::Config.distribution_server, "#{remote_target_directory}/",
-          extra_flags: ["--exclude repo_configs"]
-        )
-      end
-
-      # If we just shipped a tagged version, we want to make it immutable
-      files = Dir.glob("#{local_source_directory}/**/*")
-                 .select { |f| File.file?(f) and !f.include? "#{Pkg::Config.ref}.yaml" }
-                 .map { |f| "#{remote_target_directory}/#{f.sub(/^#{local_source_directory}\//, '')}" }
-
-      Pkg::Util::Net.remote_set_ownership(Pkg::Config.distribution_server, 'root', 'release', files)
-      Pkg::Util::Net.remote_set_permissions(Pkg::Config.distribution_server, '0664', files)
-      Pkg::Util::Net.remote_set_immutable(Pkg::Config.distribution_server, files)
-    end
-  end
-end

data/lib/packaging/util/ezbake.rb

@@ -1,26 +0,0 @@
-# Utility methods for handling ezbake
-
-require 'fileutils'
-
-module Pkg::Util::EZbake
-  class << self
-    def add_manifest(target_directory)
-      ezbake_manifest = File.join('ext', 'ezbake.manifest')
-      ezbake_yaml = File.join('ext', 'ezbake.manifest.yaml')
-
-      if File.exist?(ezbake_manifest)
-        FileUtils.cp(
-          ezbake_manifest,
-          File.join(target_directory, "#{Pkg::Config.ref}.ezbake.manifest")
-        )
-      end
-
-      if File.exists?(ezbake_yaml)
-        FileUtils.cp(
-          ezbake_yaml,
-          File.join(target_directory, "#{Pkg::Config.ref}.ezbake.manifest.yaml")
-        )
-      end
-    end
-  end
-end

data/lib/packaging/util/windows.rb

@@ -1,38 +0,0 @@
-# Utility methods for handling windows
-
-require 'fileutils'
-
-module Pkg::Util::Windows
-  class << self
-    def add_msi_links(local_source_directory)
-      {
-        'windows' => ['x86', 'x64'],
-        'windowsfips' => ['x64']
-      }.each_pair do |platform, archs|
-        packages = Dir["#{local_source_directory}/#{platform}/*"]
-
-        archs.each do |arch|
-          package_version = Pkg::Util::Git.describe.tr('-', '.')
-          package_filename = File.join(
-            local_source_directory, platform,
-            "#{Pkg::Config.project}-#{package_version}-#{arch}.msi"
-          )
-          link_filename = File.join(
-            local_source_directory,
-            platform,
-            "#{Pkg::Config.project}-#{arch}.msi"
-          )
-
-          next unless !packages.include?(link_filename) && packages.include?(package_filename)
-
-          # Dear future code spelunkers:
-          # Using symlinks instead of hard links causes failures when we try
-          # to set these files to be immutable. Also be wary of whether the
-          # linking utility you're using expects the source path to be relative
-          # to the link target or pwd.
-          FileUtils.ln(package_filename, link_filename)
-        end
-      end
-    end
-  end
-end