packaging 0.109.6 → 0.110.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32d736d1f8c71d39d4bec89be3912f6d5732559b8daebeb354528aac4be1299c
-  data.tar.gz: 7a991083858e8e3ecee1eb932957efb08f8a311f15ad0ee78e5f079c30735d57
+  metadata.gz: 9d2201555910a89425cf802f7b7126d167c2e2cb8d0c7ada3adeb7ba7dc29f05
+  data.tar.gz: 929d502f2ac04d67578be5cbde92915093ec8d70491f0e83127d72528dcb2fe5
 SHA512:
-  metadata.gz: c0f83a7ae6d76e30ad25eebda51821db91647e30fc989e1a34286533b50944f544b108aafa5c740389f10b58c2f66216777541f77f7e5436c97d0664f8c4bf06
-  data.tar.gz: 40053960778a12af76d29796551397596f751710a4d7d1a899677c1b016996b3e5c128c014dcf676d476ced7532493c5adee4f456242926598d0a646bc5ea40d
+  metadata.gz: 2daf0d7f45ec14f6c1a6fc92dcf1899e5fc916e32f9190285381c9fccde816a23aabff6367ab8abad6c6d71ffcc339d2a1cbaf8769ec53bab19d40b28ed41419
+  data.tar.gz: ceb3b6e5aa2c3cd6c0d097feb7b08d22e569e175ba10c395f6dfd732e3a438224bbd17065710235f8a36cb11917a5e07f89de19d5ac8b04bc13412b63a482021

data/lib/packaging/platforms.rb

@@ -123,14 +123,6 @@ module Pkg
       },
 
       'sles' => {
-        '11' => {
-          architectures: ['x86_64', 'i386'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v3',
-          repo: true,
-        },
         '12' => {
           architectures: ['x86_64', 'ppc64le'],
           source_architecture: 'SRPMS',

data/lib/packaging/util/net.rb

@@ -390,7 +390,7 @@ module Pkg::Util::Net
     end
 
     def remote_bundle_install_command
-      rvm_ruby_version = ENV['RVM_RUBY_VERSION'] || '2.7.5'
+      rvm_ruby_version = ENV['RVM_RUBY_VERSION'] || '3.1.1'
       export_packaging_location = "export PACKAGING_LOCATION='#{ENV['PACKAGING_LOCATION']}';" if ENV['PACKAGING_LOCATION'] && !ENV['PACKAGING_LOCATION'].empty?
       export_vanagon_location = "export VANAGON_LOCATION='#{ENV['VANAGON_LOCATION']}';" if ENV['VANAGON_LOCATION'] && !ENV['VANAGON_LOCATION'].empty?
       "source /usr/local/rvm/scripts/rvm; rvm use ruby-#{rvm_ruby_version}; #{export_packaging_location} #{export_vanagon_location} bundle install --path .bundle/gems ;"

data/lib/packaging/util.rb

@@ -4,7 +4,6 @@ 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'

data/spec/lib/packaging/sign_spec.rb

@@ -63,7 +63,7 @@ describe 'Pkg::Sign' do
         %W[#{rpm_directory}/aix/7.1/PC1/ppc/puppet-agent-5.5.3-1.aix7.1.ppc.rpm]
       end
       let(:v3_rpms) do
-        %W[#{rpm_directory}/sles/11/PC1/x86_64/puppet-agent-5.5.3-1.sles11.x86_64.rpm]
+        %W[#{rpm_directory}/redhatfips/7/PC1/x86_64/puppet-agent-5.5.3-1.redhatfips7.x86_64.rpm]
       end
       let(:v4_rpms) do
         %W[%#{rpm_directory}/el/7/PC1/aarch64/puppet-agent-5.5.3-1.el7.aarch64.rpm]

data/tasks/jenkins.rake

@@ -299,14 +299,6 @@ namespace :pl do
       Rake::Task['pl:jenkins:stage_nightlies'].invoke
       Rake::Task['pl:remote:update_nightly_repos'].invoke
       Rake::Task['pl:remote:deploy_nightlies_to_s3'].invoke
-
-      # This serves as a cheap feature toggle to avoid things not ready to
-      # use it. It should be removed in future versions.
-      if ENV['NIGHTLY_SHIP_TO_GCP']
-        ## apt.repos.puppet.com
-        Rake::Task['pl:stage_nightly_debs'].invoke
-        Rake::Task['pl:remote:sync_apt_repo_to_gcp'].invoke
-      end
     end
 
     task :ship_final => "pl:fetch" do
@@ -314,14 +306,6 @@ namespace :pl do
       Rake::Task['pl:remote:update_foss_repos'].invoke
       Rake::Task['pl:remote:deploy_final_builds_to_s3'].invoke
       Rake::Task['pl:remote:deploy_to_rsync_server'].invoke
-
-      # This serves as a cheap feature toggle to avoid things not ready to
-      # use it. It should be removed in future versions.
-      if ENV['STABLE_SHIP_TO_GCP']
-        ## apt.repos.puppet.com
-        Rake::Task['pl:stage_stable_debs'].invoke
-        Rake::Task['pl:remote:sync_apt_repo_to_gcp'].invoke
-      end
     end
 
     task :stage_release_packages => "pl:fetch" do

data/tasks/nightly_repos.rake

@@ -107,7 +107,7 @@ namespace :pl do
         # names stay the same between runs. Their contents have the ref
         # stripped off and the project replaced by $project-latest. Then the
         # repos directory is a symlink to the last pushed ref's repos.
-        FileUtils.cp_r(File.join(local_target, "repo_configs"), "#{Pkg::Config.project}-latest", { :preserve => true })
+        FileUtils.cp_r(File.join(local_target, "repo_configs"), "#{Pkg::Config.project}-latest", preserve: true)
 
         # Now we need to remove the ref and replace $project with
         # $project-latest so that it will work as a pinned latest repo

data/tasks/ship.rake

@@ -297,27 +297,6 @@ namespace :pl do
       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
-      GCP_REPO_SYNC = '/usr/local/bin/gcp_repo_sync'
-      target_site = 'apt.repos.puppet.com'
-      sync_command_puppet_6 = "#{GCP_REPO_SYNC} #{target_site} puppet6"
-      sync_command_puppet_7 = "#{GCP_REPO_SYNC} #{target_site} 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)
-      end
-
-      Pkg::Util::Execution.retry_on_fail(times: 3) do
-        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
       Rake::Task['pl:remote:deploy_apt_repo_to_s3'].invoke
@@ -390,18 +369,6 @@ namespace :pl do
     )
   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')
-  end
-
   desc 'Ship built gem to rubygems.org, internal Gem mirror, and public file server'
   task ship_gem: 'pl:fetch' do
     # We want to ship a Gem only for projects that build gems, so

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.109.6
+  version: 0.110.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -185,7 +185,6 @@ 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
@@ -309,27 +308,27 @@ specification_version: 4
 summary: Puppet by Perforce packaging automation
 test_files:
 - spec/lib/packaging_spec.rb
-- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/platforms_spec.rb

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