packaging 0.109.7 → 0.110.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0302fad395c2dbc8aa71645b463a4da5f333341b5f9a542cfd78b72488c4c98d
-  data.tar.gz: fe97ea4b5923e8efaf3243eca8ddc20e2cd9f58ab097d68b25af53082a8bc7d9
+  metadata.gz: f531bbfb5a05625e55cdf14b09928314d13999addf12b7c77ddb8ed954c187e1
+  data.tar.gz: f7fc4ca10a227835456ac481b71b14adc916d55e218dc975bcb0c3e6ebd92859
 SHA512:
-  metadata.gz: 8cf5ba1d6868d2490a2c1be7a08287ceec001d5d3b4b43f5d0cb8e446cbc566bf0e353e31b41b2acb5ac72441758d7df9ef45df225e9dbc7be3117ebccc62348
-  data.tar.gz: 83ded7c09cd11571d96c43bf862b5f9e2409ae666b1063d5757b4d2090c3208bc91ce1ce4522ec840f9ccda132a58edd6cf235532b343d9053d240b069172a94
+  metadata.gz: 98aa70e3f509f803d1e0e2d65d2121ab81197b9d412ea57ab8c3e8750d68374e87b81a89d10d2597b5b4b58f01873985c21a47047c9df70c63cafae7d9e3d855
+  data.tar.gz: 60d5a3851e2765a421327cb7ac105e4f132b1d96d91731eef10da0e39a44976c940360f6ae5effe9869cc230924d1b1d09dce8162cbd0a762826a7ef06a02a0c

data/lib/packaging/platforms.rb

@@ -18,6 +18,13 @@ module Pkg
           source_package_formats: ['src.rpm'],
           repo: false,
         },
+        '7.2' => {
+          architectures: ['power'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          repo: false,
+        },
       },
 
       'debian' => {
@@ -49,7 +56,7 @@ module Pkg
           repo: true,
         },
         '7' => {
-          architectures: ['x86_64', 'ppc64le', 'aarch64'],
+          architectures: ['x86_64', 'ppc64le'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -86,17 +93,17 @@ module Pkg
       },
 
       'osx' => {
-        '10.15' => {
-          architectures: ['x86_64'],
+        '11' => {
+          architectures: ['x86_64', 'arm64'],
           package_format: 'dmg',
           repo: false,
         },
-        '11' => {
+        '12' => {
           architectures: ['x86_64', 'arm64'],
           package_format: 'dmg',
           repo: false,
         },
-        '12' => {
+        '13' => {
           architectures: ['x86_64', 'arm64'],
           package_format: 'dmg',
           repo: false,
@@ -123,14 +130,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

@@ -184,7 +184,7 @@ module Pkg::Util::Net
         target_host: nil,
         extra_flags: nil,
         dryrun: ENV['DRYRUN']
-}.merge(opts.delete_if { |_, value| value.nil? })
+}.merge(opts.compact)
 
       stdout, = Pkg::Util::Execution.capture3(rsync_cmd(source, options), true)
       stdout

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/artifactory_spec.rb

@@ -36,11 +36,6 @@ describe 'artifactory.rb' do
         :repo_config => '',
         :additional_artifacts => ["./windowsfips/puppet-agent-extras-5.3.1.34-x64.msi"],
       },
-      'osx-10.15-x86_64' => {
-        :artifact => "./apple/10.15/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg",
-        :repo_config => '',
-        :additional_artifacts => ["./apple/10.15/PC1/x86_64/puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.15.dmg"],
-      },
       'osx-11-x86_64' => {
         :artifact => "./apple/11/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx11.dmg",
         :repo_config => '',
@@ -89,12 +84,6 @@ describe 'artifactory.rb' do
       :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']
     },
-    'osx-10.15-x86_64' => {
-      :toplevel_repo => 'generic',
-      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.15-x86_64",
-      :package_name => 'path/to/an/osx/10.15/package/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg',
-      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.15.dmg']
-    },
     'osx-11-x86_64' => {
       :toplevel_repo => 'generic',
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-11-x86_64",

data/spec/lib/packaging/config_spec.rb

@@ -203,7 +203,6 @@ describe 'Pkg::Config' do
 
   describe '#platform_data' do
     platform_tags = %w[
-      osx-10.15-x86_64
       osx-11-x86_64
       ubuntu-18.04-amd64
       el-6-x86_64
@@ -212,7 +211,6 @@ describe 'Pkg::Config' do
     ]
 
     artifacts =
-      "./artifacts/apple/10.15/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.15.dmg\n" \
       "./artifacts/apple/11/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx11.dmg\n" \
       "./artifacts/deb/bionic/PC1/puppet-agent_5.3.2-1bionic_amd64.deb\n" \
       "./artifacts/el/6/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.el6.x86_64.rpm\n" \

data/spec/lib/packaging/paths_spec.rb

@@ -31,7 +31,6 @@ describe 'Pkg::Paths' do
       'pkg/deb/buster/pe-r10k_3.5.2.0-1buster_amd64.deb' => 'debian-10-amd64',
       'pkg/pe/deb/bionic/pe-puppetserver_2019.8.2.32-1bionic_all.deb' => 'ubuntu-18.04-amd64',
       'artifacts/deb/focal/puppet6/puppetdb_6.13.0-1focal_all.deb' => 'ubuntu-20.04-amd64',
-      'pkg/apple/10.15/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg' => 'osx-10.15-x86_64',
       'pkg/apple/11/puppet6/x86_64/puppet-agent-6.19.0-1.osx11.dmg' => 'osx-11-x86_64',
       'pkg/windows/puppet-agent-1.9.0-x86.msi' => 'windows-2012-x86',
       'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.src.rpm' => 'el-6-SRPMS',
@@ -118,11 +117,6 @@ describe 'Pkg::Paths' do
           .to eq('artifacts/solaris/puppet6/11')
       end
 
-      it 'should be correct for osx' do
-        expect(Pkg::Paths.artifacts_path('osx-10.15-x86_64'))
-          .to eq('artifacts/mac/puppet6/10.15/x86_64')
-      end
-
       it 'should be correct for osx11' do
         expect(Pkg::Paths.artifacts_path('osx-11-x86_64'))
           .to eq('artifacts/mac/puppet6/11/x86_64')
@@ -376,7 +370,6 @@ describe 'Pkg::Paths' do
           .to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-buster.deb")
       end
       it 'returns nil for package formats that do not have release packages' do
-        expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
         expect(Pkg::Paths.release_package_link_path('osx-11-x86_64')).to eq(nil)
         expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
       end
@@ -414,7 +407,6 @@ describe 'Pkg::Paths' do
           .to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-buster.deb")
       end
       it 'returns nil for package formats that do not have release packages' do
-        expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
         expect(Pkg::Paths.release_package_link_path('osx-11-x86_64')).to eq(nil)
         expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
       end

data/spec/lib/packaging/platforms_spec.rb

@@ -97,7 +97,7 @@ describe 'Pkg::Platforms' do
   end
 
   describe '#platform_lookup' do
-    ['osx-10.15-x86_64', 'osx-11-x86_64', 'osx-12-x86_64'].each do |platform|
+    ['osx-11-x86_64', 'osx-12-x86_64'].each do |platform|
       it 'should return a hash of platform info' do
         expect(Pkg::Platforms.platform_lookup(platform)).to be_instance_of(Hash)
       end
@@ -113,10 +113,6 @@ describe 'Pkg::Platforms' do
     it 'returns info about a given platform' do
       expect(Pkg::Platforms.get_attribute('el-6-x86_64', :signature_format)).to eq('v4')
     end
-
-    it 'fails with a reasonable error when specified attribute is not defined' do
-      expect { Pkg::Platforms.get_attribute('osx-10.15-x86_64', :signature_format) }.to raise_error(/doesn't have information/)
-    end
   end
 
   describe '#package_format_for_tag' do

data/spec/lib/packaging/retrieve_spec.rb

@@ -7,11 +7,10 @@ describe 'Pkg::Retrieve' do
   remote_target = 'repos'
   project = 'puppet-agent'
   ref = 'b25e64984dd505391f248fe5501ad81e2645b6d2'
-  foss_platforms = ['el-7-x86_64', 'ubuntu-16.04-amd64', 'osx-10.15-x86_64', 'osx-11-x86_64', 'windows-2012-x64']
+  foss_platforms = ['el-7-x86_64', 'ubuntu-16.04-amd64','osx-11-x86_64', 'windows-2012-x64']
   platform_data = {:platform_data => {
     'aix-7.1-power' => {:artifact => './aix/7.1/PC1/ppc/puppet-agent-5.3.2.155.gb25e649-1.aix7.1.ppc.rpm'},
     'el-7-x86_64' => {:artifact => './el/7/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.el7.x86_64.rpm'},
-    'osx-10.15-x86_64' => {:artifact => './apple/10.15/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx10.15.dmg'},
     'osx-11-x86_64' => {:artifact => './apple/11/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx11.dmg'},
     'sles-11-i386' => {:artifact => './sles/11/PC1/i386/puppet-agent-5.3.2.155.gb25e649-1.sles11.i386.rpm'},
     'solaris-10-sparc' => {:artifact => './solaris/10/PC1/puppet-agent-5.3.2.155.gb25e649-1.sparc.pkg.gz'},

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/spec/lib/packaging/util/ship_spec.rb

@@ -45,13 +45,11 @@ describe '#Pkg::Util::Ship' do
   # Sample data for #reorganize_packages and #ship_pkgs specs
   retrieved_packages = %w[
     pkg/deb/bionic/puppet6/puppet-agent_6.19.0-1bionic_amd64.deb
-    pkg/el/7/puppet6/aarch64/puppet-agent-6.19.0-1.el7.aarch64.rpm
     pkg/el/7/puppet6/ppc64le/puppet-agent-6.19.0-1.el7.ppc64le.rpm
     pkg/el/7/puppet6/x86_64/puppet-agent-6.19.0-1.el7.x86_64.rpm
     pkg/sles/12/puppet6/ppc64le/puppet-agent-6.19.0-1.sles12.ppc64le.rpm
     pkg/sles/12/puppet6/x86_64/puppet-agent-6.19.0-1.sles12.x86_64.rpm
     pkg/sles/15/puppet6/x86_64/puppet-agent-6.19.0-1.sles15.x86_64.rpm
-    pkg/apple/10.15/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg
     pkg/fedora/36/puppet6/x86_64/puppet-agent-6.19.0-1.fc32.x86_64.rpm
     pkg/windows/puppet-agent-6.19.0-x64.msi
     pkg/windows/puppet-agent-6.19.0-x86.msi
@@ -64,13 +62,11 @@ describe '#Pkg::Util::Ship' do
   # Beware apple->mac transforms.
   expected_reorganized_packages = %w[
     pkg/bionic/puppet6/puppet-agent_6.19.0-1bionic_amd64.deb
-    pkg/puppet6/el/7/aarch64/puppet-agent-6.19.0-1.el7.aarch64.rpm
     pkg/puppet6/el/7/ppc64le/puppet-agent-6.19.0-1.el7.ppc64le.rpm
     pkg/puppet6/el/7/x86_64/puppet-agent-6.19.0-1.el7.x86_64.rpm
     pkg/puppet6/sles/12/ppc64le/puppet-agent-6.19.0-1.sles12.ppc64le.rpm
     pkg/puppet6/sles/12/x86_64/puppet-agent-6.19.0-1.sles12.x86_64.rpm
     pkg/puppet6/sles/15/x86_64/puppet-agent-6.19.0-1.sles15.x86_64.rpm
-    pkg/mac/puppet6/10.15/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg
     pkg/puppet6/fedora/36/x86_64/puppet-agent-6.19.0-1.fc32.x86_64.rpm
     pkg/windows/puppet6/puppet-agent-6.19.0-x64.msi
     pkg/windows/puppet6/puppet-agent-6.19.0-x86.msi

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/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.7
+  version: 0.110.1
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-07-21 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/repo_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/git_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/os_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/version_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/util/rake_utils_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/gem_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