packaging 0.99.77 → 0.99.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365629e0e3cba195de934ccd1cee9ecff5c7ed684ac79e4befc883420037b191
-  data.tar.gz: 2498029caf73135b3ee7c5a2704e310ae6398c4eb7716c3687db487fc827dc0d
+  metadata.gz: 5b6b5822d617cc1452e3bb9cdf7fc9c5788fc71cfe3e05557bf5a0efb0e7db07
+  data.tar.gz: 19266ebee48e9231a450a0a511e26583aeb161c8d0bf7d45fd1e4cdedd6a1673
 SHA512:
-  metadata.gz: 4a73420699b6ce732c52c527468c5b9cef405c0565aab9b33c3e592109ddee4aa965f162b4d3950a7900584994dba2994cc07602d75e36b0a53bf8dbbfcd23ec
-  data.tar.gz: f871e9711752e70ac48956663402fa3f0cdf2693ae08eff8aa0ac59384a0081e1dd27fdbac01a3a17964de4a135a9ded98d381808cace9d9dd62c6ac37d20a8d
+  metadata.gz: 84a29597af4cd4c654f127eac2179be39721af304bf71d3c7e6f0d8a216930ab9bcb782c2575d92fd20a259572ff63684efe869bb2b08019ed80e1bbf1f65585
+  data.tar.gz: d7e30e71d5f197c958dc688d9904c7a431dee71ad3669dd6d3b8792e80f5cda5153fea85272b0be19e6701b645862e0be14d2ad452e7bad46235d5764e38d874

data/lib/packaging/artifactory.rb

@@ -224,8 +224,6 @@ module Pkg
         deploy_properties(platform_tag, File.basename(package)),
         headers
       )
-    rescue
-      raise "Attempt to upload '#{package}' to #{File.join(@artifactory_uri, data[:full_artifactory_path])} failed"
     end
 
     # @param pkg [String] The package to download YAML for
@@ -344,40 +342,69 @@ module Pkg
       end
     end
 
-    # Using the manifest provided by enterprise-dist, grab the appropropriate packages from artifactory based on md5sum
+    # Using the manifest provided by enterprise-dist, grab the
+    # appropropriate packages from artifactory based on md5sum
+
     # @param staging_directory [String] location to download packages to
-    # @param manifest [File] JSON file containing information about what packages to download and the corresponding md5sums
+    # @param manifest [File] JSON file listing which packages to download and
+    #   the corresponding md5sums
     # @param remote_path [String] Optional partial path on the remote host containing packages
     #        Used to specify which subdirectories packages will be downloaded from.
     def download_packages(staging_directory, manifest, remote_path = '')
       check_authorization
+      download_repositories = %w(rpm_enterprise__local debian_enterprise__local)
       manifest.each do |dist, packages|
-        puts "Grabbing the #{dist} packages from artifactory"
         packages.each do |name, info|
-          filename = info['filename']
-          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename)
-          artifact_to_download = artifacts.select { |artifact| artifact.download_uri.include? remote_path }.first
-          # If we found matching artifacts, but not in the correct path, copy the artifact to the correct path
-          # This should help us keep repos up to date with the packages we are expecting to be there
-          # while helping us avoid 'what the hell, could not find package' errors
+          package_file_name = info['filename']
+          puts format(
+                 "Searching Artifactory [%s]%s for %s (md5: %s)",
+                 download_repositories.join(', '),
+                 remote_path.empty? ? '' : "/#{remote_path}",
+                 package_file_name,
+                 info['md5']
+               )
+          artifacts = Artifactory::Resource::Artifact.checksum_search(
+            md5: info['md5'],
+            repos: download_repositories,
+            name: package_file_name
+          )
+
+          artifact_to_download = artifacts.select do |artifact|
+            artifact.download_uri.include? remote_path
+          end.first
+
+          # If we found matching artifacts, but not in the correct
+          # path, copy the artifact to the correct path This should
+          # help us keep repos up to date with the packages we are
+          # expecting to be there while helping us avoid 'could not
+          # find package' errors
           if artifact_to_download.nil? && !artifacts.empty?
             artifact_to_copy = artifacts.first
-            copy_artifact(artifact_to_copy, artifact_to_copy.repo, "#{remote_path}/#{dist}/#{filename}")
-            artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename)
-            artifact_to_download = artifacts.select { |artifact| artifact.download_uri.include? remote_path }.first
+            copy_artifact(artifact_to_copy, artifact_to_copy.repo,
+                          "#{remote_path}/#{dist}/#{package_file_name}")
+
+            # Now, search again to make sure we find them in the correct path.
+            artifacts = Artifactory::Resource::Artifact.checksum_search(
+              md5: info['md5'],
+              repos: download_repositories,
+              name: package_file_name
+            )
+            artifact_to_download = artifacts.select do |artifact|
+              artifact.download_uri.include? remote_path
+            end.first
           end
 
           if artifact_to_download.nil?
-            message = "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
-            unless remote_path.empty?
-              message += " in #{remote_path}"
-            end
+            message = "Error: could not find package #{package_file_name} " \
+                      "with md5sum #{info['md5']}"
+            message += " in #{remote_path}" unless remote_path.empty?
             raise message
-          else
-            full_staging_path = "#{staging_directory}/#{dist}"
-            puts "downloading #{artifact_to_download.download_uri} to #{File.join(full_staging_path, filename)}"
-            artifact_to_download.download(full_staging_path, filename: filename)
           end
+
+          full_staging_path = "#{staging_directory}/#{dist}"
+          puts "Downloading #{artifact_to_download.download_uri} to " \
+               "#{File.join(full_staging_path, package_file_name)}"
+          artifact_to_download.download(full_staging_path, filename: package_file_name)
         end
       end
     end

data/lib/packaging/config/params.rb

@@ -65,6 +65,7 @@ module Pkg::Params
                   :gem_files,
                   :gem_forge_project,
                   :gem_host,
+                  :gem_license,
                   :gem_name,
                   :gem_path,
                   :gem_platform_dependencies,

data/lib/packaging/platforms.rb

@@ -46,6 +46,14 @@ module Pkg
           source_package_formats: DEBIAN_SOURCE_FORMATS,
           repo: true,
         },
+        '11' => {
+          codename: 'bullseye',
+          architectures: ['amd64'],
+          source_architecture: 'source',
+          package_format: 'deb',
+          source_package_formats: DEBIAN_SOURCE_FORMATS,
+          repo: true,
+        },
       },
 
       'el' => {
@@ -135,7 +143,7 @@ module Pkg
           repo: false,
         },
         '11' => {
-          architectures: ['x86_64'],
+          architectures: ['x86_64', 'arm64'],
           package_format: 'dmg',
           repo: false,
         },
@@ -149,6 +157,14 @@ module Pkg
           source_package_formats: ['src.rpm'],
           signature_format: 'v3',
           repo: true,
+        },
+        '8' => {
+          architectures: ['x86_64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v3',
+          repo: true,
         }
       },
 
@@ -211,7 +227,7 @@ module Pkg
         },
         '18.04' => {
           codename: 'bionic',
-          architectures: ['amd64', 'ppc64el'],
+          architectures: ['amd64', 'ppc64el', 'aarch64'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,

data/lib/packaging/sign/dmg.rb

@@ -1,41 +1,79 @@
 module Pkg::Sign::Dmg
   module_function
 
-  def sign(target_dir = 'pkg')
-    use_identity = "-i #{Pkg::Config.osx_signing_ssh_key}" unless Pkg::Config.osx_signing_ssh_key.nil?
-
-    if Pkg::Config.osx_signing_server =~ /@/
-      host_string = "#{Pkg::Config.osx_signing_server}"
-    else
-      host_string = "#{ENV['USER']}@#{Pkg::Config.osx_signing_server}"
+  def sign(pkg_directory = 'pkg')
+    use_identity = ''
+    unless Pkg::Config.osx_signing_ssh_key.nil?
+      use_identity = "-i #{Pkg::Config.osx_signing_ssh_key}"
     end
+
+    host_string = "#{ENV['USER']}@#{Pkg::Config.osx_signing_server}"
+    host_string = "#{Pkg::Config.osx_signing_server}" if Pkg::Config.osx_signing_server =~ /@/
+
     ssh_host_string = "#{use_identity} #{host_string}"
     rsync_host_string = "-e 'ssh #{use_identity}' #{host_string}"
+    archs =  Dir.glob("#{pkg_directory}/{apple,mac,osx}/**/{x86_64,arm64}").map { |el| el.split('/').last }
+
+    if archs.empty?
+      $stderr.puts "Error: no architectures found in #{pkg_directory}/{apple,mac,osx}"
+      exit 1
+    end
+
+    archs.each do |arch|
+      remote_working_directory = "/tmp/#{Pkg::Util.rand_string}/#{arch}"
+      dmg_mount_point = File.join(remote_working_directory, "mount")
+      signed_items_directory    = File.join(remote_working_directory, "signed")
+
+      dmgs = Dir.glob("#{pkg_directory}/{apple,mac,osx}/**/#{arch}/*.dmg")
+      if dmgs.empty?
+        $stderr.puts "Error: no dmgs found in #{pkg_directory}/{apple,mac,osx} for #{arch} architecture."
+        exit 1
+      end
+
+      dmg_basenames = dmgs.map { |d| File.basename(d, '.dmg') }.join(' ')
+
+      sign_package_command = %W[
+        for dmg in #{dmg_basenames}; do
+          /usr/bin/hdiutil attach #{remote_working_directory}/$dmg.dmg
+            -mountpoint #{dmg_mount_point} -nobrowse -quiet ;
 
-    work_dir  = "/tmp/#{Pkg::Util.rand_string}"
-    mount     = File.join(work_dir, "mount")
-    signed    = File.join(work_dir, "signed")
-    Pkg::Util::Net.remote_execute(ssh_host_string, "mkdir -p #{mount} #{signed}")
-    dmgs = Dir.glob("#{target_dir}/apple/**/*.dmg")
-    Pkg::Util::Net.rsync_to(dmgs.join(" "), rsync_host_string, work_dir)
-    Pkg::Util::Net.remote_execute(ssh_host_string, %Q[for dmg in #{dmgs.map { |d| File.basename(d, ".dmg") }.join(" ")}; do
-      /usr/bin/hdiutil attach #{work_dir}/$dmg.dmg -mountpoint #{mount} -nobrowse -quiet ;
-      /usr/bin/security -q unlock-keychain -p "#{Pkg::Config.osx_signing_keychain_pw}" "#{Pkg::Config.osx_signing_keychain}" ;
-        for pkg in $(ls #{mount}/*.pkg | xargs -n 1 basename); do
-          if /usr/sbin/pkgutil --check-signature #{mount}/$pkg ; then
-            echo "$pkg is already signed, skipping . . ." ;
-            cp #{mount}/$pkg #{signed}/$pkg ;
-          else
-            /usr/bin/productsign --keychain "#{Pkg::Config.osx_signing_keychain}" --sign "#{Pkg::Config.osx_signing_cert}" #{mount}/$pkg #{signed}/$pkg ;
-          fi
+          /usr/bin/security -q unlock-keychain
+            -p "#{Pkg::Config.osx_signing_keychain_pw}" "#{Pkg::Config.osx_signing_keychain}" ;
+
+          for pkg in #{dmg_mount_point}/*.pkg; do
+            pkg_basename=$(basename $pkg) ;
+            if /usr/sbin/pkgutil --check-signature $pkg ; then
+              echo "Warning: $pkg is already signed, skipping" ;
+              cp $pkg #{signed_items_directory}/$pkg_basename ;
+              continue ;
+            fi ;
+
+            /usr/bin/productsign --keychain "#{Pkg::Config.osx_signing_keychain}"
+              --sign "#{Pkg::Config.osx_signing_cert}"
+              $pkg #{signed_items_directory}/$pkg_basename ;
+          done ;
+
+          /usr/bin/hdiutil detach #{dmg_mount_point} -quiet ;
+          /bin/rm #{remote_working_directory}/$dmg.dmg ;
+          /usr/bin/hdiutil create -volname $dmg
+            -srcfolder #{signed_items_directory}/ #{remote_working_directory}/$dmg.dmg ;
+          /bin/rm #{signed_items_directory}/* ;
         done
-      /usr/bin/hdiutil detach #{mount} -quiet ;
-      /bin/rm #{work_dir}/$dmg.dmg ;
-      /usr/bin/hdiutil create -volname $dmg -srcfolder #{signed}/ #{work_dir}/$dmg.dmg ;
-      /bin/rm #{signed}/* ; done])
-    dmgs.each do | dmg |
-      Pkg::Util::Net.rsync_from("#{work_dir}/#{File.basename(dmg)}", rsync_host_string, File.dirname(dmg))
+      ].join(' ')
+
+      Pkg::Util::Net.remote_execute(ssh_host_string,
+                                    "mkdir -p #{dmg_mount_point} #{signed_items_directory}")
+
+      Pkg::Util::Net.rsync_to(dmgs.join(' '), rsync_host_string, remote_working_directory)
+
+      Pkg::Util::Net.remote_execute(ssh_host_string, sign_package_command)
+
+      dmgs.each do |dmg|
+        Pkg::Util::Net.rsync_from(
+          "#{remote_working_directory}/#{File.basename(dmg)}", rsync_host_string, File.dirname(dmg))
+      end
+
+      Pkg::Util::Net.remote_execute(ssh_host_string, "rm -rf '#{remote_working_directory}'")
     end
-    Pkg::Util::Net.remote_execute(ssh_host_string, "if [ -d '#{work_dir}' ]; then rm -rf '#{work_dir}'; fi")
   end
 end

data/spec/lib/packaging/config_spec.rb

@@ -52,6 +52,7 @@ describe "Pkg::Config" do
                   :gem_files,
                   :gem_forge_project,
                   :gem_host,
+                  :gem_license,
                   :gem_name,
                   :gem_path,
                   :gem_platform_dependencies,

data/spec/lib/packaging/platforms_spec.rb

@@ -36,7 +36,7 @@ describe 'Pkg::Platforms' do
 
   describe '#codenames' do
     it 'should return all codenames for a given platform' do
-      codenames = ['focal', 'bionic', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
+      codenames = ['focal', 'bionic', 'bullseye', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end

data/tasks/gem.rake

@@ -39,23 +39,24 @@ end
 
 def create_default_gem_spec
   spec = Gem::Specification.new do |s|
-    s.name = Pkg::Config.project                                     unless Pkg::Config.project.nil?
-    s.name = Pkg::Config.gem_name                                    unless Pkg::Config.gem_name.nil?
-    s.version = Pkg::Config.gemversion                               unless Pkg::Config.gemversion.nil?
-    s.author = Pkg::Config.author                                    unless Pkg::Config.author.nil?
-    s.email = Pkg::Config.email                                      unless Pkg::Config.email.nil?
-    s.homepage = Pkg::Config.homepage                                unless Pkg::Config.homepage.nil?
-    s.summary = Pkg::Config.summary                                  unless Pkg::Config.summary.nil?
-    s.summary = Pkg::Config.gem_summary                              unless Pkg::Config.gem_summary.nil?
-    s.description = Pkg::Config.description                          unless Pkg::Config.description.nil?
-    s.description = Pkg::Config.gem_description                      unless Pkg::Config.gem_description.nil?
-    s.files = glob_gem_files                                         unless glob_gem_files.nil?
-    s.executables = Pkg::Config.gem_executables                      unless Pkg::Config.gem_executables.nil?
-    s.require_path = Pkg::Config.gem_require_path                    unless Pkg::Config.gem_require_path.nil?
-    s.required_ruby_version = Pkg::Config.gem_required_ruby_version  unless Pkg::Config.gem_required_ruby_version.nil?
+    s.name = Pkg::Config.project                                            unless Pkg::Config.project.nil?
+    s.name = Pkg::Config.gem_name                                           unless Pkg::Config.gem_name.nil?
+    s.version = Pkg::Config.gemversion                                      unless Pkg::Config.gemversion.nil?
+    s.author = Pkg::Config.author                                           unless Pkg::Config.author.nil?
+    s.email = Pkg::Config.email                                             unless Pkg::Config.email.nil?
+    s.homepage = Pkg::Config.homepage                                       unless Pkg::Config.homepage.nil?
+    s.summary = Pkg::Config.summary                                         unless Pkg::Config.summary.nil?
+    s.summary = Pkg::Config.gem_summary                                     unless Pkg::Config.gem_summary.nil?
+    s.description = Pkg::Config.description                                 unless Pkg::Config.description.nil?
+    s.description = Pkg::Config.gem_description                             unless Pkg::Config.gem_description.nil?
+    s.files = glob_gem_files                                                unless glob_gem_files.nil?
+    s.executables = Pkg::Config.gem_executables                             unless Pkg::Config.gem_executables.nil?
+    s.require_path = Pkg::Config.gem_require_path                           unless Pkg::Config.gem_require_path.nil?
+    s.required_ruby_version = Pkg::Config.gem_required_ruby_version         unless Pkg::Config.gem_required_ruby_version.nil?
     s.required_rubygems_version = Pkg::Config.gem_required_rubygems_version unless Pkg::Config.gem_required_rubygems_version.nil?
-    s.test_files = FileList[Pkg::Config.gem_test_files.split(' ')]   unless Pkg::Config.gem_test_files.nil?
-    s.rubyforge_project = Pkg::Config.gem_forge_project              unless Pkg::Config.gem_forge_project.nil?
+    s.test_files = FileList[Pkg::Config.gem_test_files.split(' ')]          unless Pkg::Config.gem_test_files.nil?
+    s.license = Pkg::Config.gem_license                                     unless Pkg::Config.gem_license.nil?
+    s.rubyforge_project = Pkg::Config.gem_forge_project                     unless Pkg::Config.gem_forge_project.nil?
     Pkg::Config.gem_rdoc_options.each do |option|
       s.rdoc_options << option
     end unless Pkg::Config.gem_rdoc_options.nil?

data/tasks/nightly_repos.rake

@@ -93,7 +93,7 @@ DOC
         # The repo configs have Pkg::Config.builds_server used in them, but that
         # is internal, so we need to replace it with our public server. We also
         # want them only to see repos, and not signed repos, since the host is
-        # called nightlies.puppetlabs.com. Here we replace those values in each
+        # called nightlies.puppet.com. Here we replace those values in each
         # config with the desired value.
         Dir.glob("#{local_target}/repo_configs/**/*").select { |t_config| File.file?(t_config) }.each do |config|
           new_contents = File.read(config).gsub(Pkg::Config.builds_server, target_host).gsub(/#{target_prefix}_repos/, "repos")

data/tasks/ship.rake

@@ -172,20 +172,10 @@ namespace :pl do
       end
     end
 
-    desc "Copy signed deb repos from #{Pkg::Config.apt_signing_server} to AWS S3"
-    task :deploy_apt_repo_to_s3 => 'pl:fetch' do
-      puts "Really run S3 sync to deploy Debian repos from #{Pkg::Config.apt_signing_server} to AWS S3? [y,n]"
-      if Pkg::Util.ask_yes_or_no
-        Pkg::Util::Execution.retry_on_fail(:times => 3) do
-          command = 'sudo /usr/local/bin/s3_repo_sync.sh apt.puppetlabs.com'
-          Pkg::Util::Net.remote_execute(Pkg::Config.apt_signing_server, command)
-        end
-      end
-    end
-
     desc "Copy rpm repos from #{Pkg::Config.yum_staging_server} to #{Pkg::Config.yum_host}"
     task deploy_yum_repo: 'pl:fetch' do
-      puts "Really run remote rsync to deploy yum repos from #{Pkg::Config.yum_staging_server} to #{Pkg::Config.yum_host}? [y,n]"
+      puts "Really run remote rsync to deploy yum repos from #{Pkg::Config.yum_staging_server} " \
+           "to #{Pkg::Config.yum_host}? [y,n]"
       if Pkg::Util.ask_yes_or_no
         Pkg::Util::Execution.retry_on_fail(times: 3) do
           Pkg::Rpm::Repo.deploy_repos(
@@ -198,27 +188,67 @@ namespace :pl do
       end
     end
 
-    desc "Copy signed RPM repos from #{Pkg::Config.yum_staging_server} to AWS S3"
+    ##
+    ## S3 / GCP syncing
+    S3_REPO_SYNC = 'sudo /usr/local/bin/s3_repo_sync.sh'
+    GCP_REPO_SYNC = '/usr/local/bin/gcp_repo_sync'
+
+    desc "Sync signed apt repos from #{Pkg::Config.apt_signing_server} to AWS S3"
+    task :deploy_apt_repo_to_s3 => 'pl:fetch' do
+      sync_command = "#{S3_REPO_SYNC} apt.puppetlabs.com"
+      puts "Sync apt repos from #{Pkg::Config.apt_signing_server} to AWS S3? [y,n]"
+      next unless Pkg::Util.ask_yes_or_no
+
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.apt_signing_server, sync_command)
+      end
+    end
+
+    desc "Sync signed yum repos from #{Pkg::Config.yum_staging_server} to AWS S3"
     task :deploy_yum_repo_to_s3 => 'pl:fetch' do
-      puts "Really run S3 sync to deploy RPM repos from #{Pkg::Config.yum_staging_server} to AWS S3? [y,n]"
-      if Pkg::Util.ask_yes_or_no
-        Pkg::Util::Execution.retry_on_fail(:times => 3) do
-          command = 'sudo /usr/local/bin/s3_repo_sync.sh yum.puppetlabs.com'
-          Pkg::Util::Net.remote_execute(Pkg::Config.yum_staging_server, command)
-        end
+      sync_command = "#{S3_REPO_SYNC} yum.puppetlabs.com"
+      puts "Sync yum repos from #{Pkg::Config.yum_staging_server} to AWS S3? [y,n]"
+      next unless Pkg::Util.ask_yes_or_no
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.yum_staging_server, sync_command)
       end
     end
 
     desc "Sync downloads.puppetlabs.com from #{Pkg::Config.staging_server} to AWS S3"
     task :deploy_downloads_to_s3 => 'pl:fetch' do
-      puts "Really run S3 sync to sync downloads.puppetlabs.com from #{Pkg::Config.staging_server} to AWS S3? [y,n]"
-      if Pkg::Util.ask_yes_or_no
-        Pkg::Util::Execution.retry_on_fail(:times => 3) do
-          command = 'sudo /usr/local/bin/s3_repo_sync.sh downloads.puppetlabs.com'
-          Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
-        end
+      sync_command = "#{S3_REPO_SYNC} downloads.puppetlabs.com"
+      puts "Sync downloads.puppetlabs.com from #{Pkg::Config.staging_server} to AWS S3? [y,n]"
+      next unless Pkg::Util.ask_yes_or_no
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, sync_command)
+      end
+    end
+
+    desc "Sync nightlies.puppet.com from #{Pkg::Config.staging_server} to AWS S3"
+    task :deploy_nightlies_to_s3 => 'pl:fetch' do
+      sync_command = "#{S3_REPO_SYNC} nightlies.puppet.com"
+      puts "Syncing nightly builds from #{Pkg::Config.staging_server} to AWS S3"
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, sync_command)
+      end
+    end
+
+    desc "Sync signed apt repos from #{Pkg::Config.apt_signing_server} to Google Cloud Platform"
+    task :sync_apt_repo_to_gcp => 'pl:fetch' do
+      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"
+      print "Sync apt repos from #{Pkg::Config.apt_signing_server} to #{target_site}? [y,n] "
+      next unless Pkg::Util.ask_yes_or_no
+      puts
+
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        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
+    task :deploy_apt_repo_to_gcp => :sync_apt_repo_to_gcp
 
     desc "Sync apt, yum, and downloads.pl.com to AWS S3"
     task :deploy_final_builds_to_s3 => "pl:fetch" do
@@ -227,15 +257,6 @@ namespace :pl do
       Rake::Task['pl:remote:deploy_downloads_to_s3'].invoke
     end
 
-    desc "Sync nightlies.puppetlabs.com from #{Pkg::Config.staging_server} to AWS S3"
-    task :deploy_nightlies_to_s3 => 'pl:fetch' do
-      puts "Deploying nightly builds from #{Pkg::Config.staging_server} to AWS S3..."
-      Pkg::Util::Execution.retry_on_fail(:times => 3) do
-        command = 'sudo /usr/local/bin/s3_repo_sync.sh nightlies.puppet.com'
-        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
-      end
-    end
-
     desc "Sync yum and apt from #{Pkg::Config.staging_server} to rsync servers"
     task :deploy_to_rsync_server => 'pl:fetch' do
       # This task must run after the S3 sync has run, or else /opt/repo-s3-stage won't be up-to-date
@@ -553,7 +574,17 @@ namespace :pl do
       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|
+      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
+      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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.77
+  version: 0.99.81
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -260,28 +260,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging_spec.rb