packaging 0.106.2 → 0.107.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193d585363a1423508a90e96a1b3df94e8152e74c1dd72083f5b589b5b143501
-  data.tar.gz: 22492fe7cebbcda8a61742c5d1c1b88073d2b170a392c3f639ef01968a9ad456
+  metadata.gz: 26256ba67865f30df015a2bb0e52865c2cbc0962f2048ed468f717a115a273c8
+  data.tar.gz: fb1552330cbfb4e3d7bbfd0bbcfb246513d4a5b78a6e34839b90b265a90b0a7b
 SHA512:
-  metadata.gz: edc24fcef7b4c1fcc6d63796628a094d3d1d299cc0d29b761af91146c11dfa8627af60b49ee368d15366b324f1d163af013796c6137ea5de08e035d3633811a4
-  data.tar.gz: 297b0577830caeef96526ee289d5d2c31da95237f3d57af53af8a650387a936e3ba1064c790bf1a9b9269f21b859a031f91e30ad49e43cd121d014e193d8123e
+  metadata.gz: 521387bdf33b936af8242142f115e50c14343cf842e1d28005c39cc691f1449e241b3344758e40a4f1bdc1dbe161f726e9b0f0c02f50e36c0e8e0e1dffcdef71
+  data.tar.gz: 186692c9b584fbd87c989376dce126bd6f4f549756cf90b3cf1e78a171eea9c4c7ddc4cf95fa0c76bb8e54a2ab182e293f238fdd3df84a1fdfa3a375d94a39bc

data/lib/packaging/platforms.rb

@@ -99,6 +99,14 @@ module Pkg
           signature_format: 'v4',
           repo: true,
         },
+        '36' => {
+          architectures: ['x86_64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
       },
 
       'osx' => {
@@ -211,6 +219,14 @@ module Pkg
           source_package_formats: DEBIAN_SOURCE_FORMATS,
           repo: true,
         },
+        '22.04' => {
+          codename: 'jammy',
+          architectures: ['amd64', 'aarch64'],
+          source_architecture: 'source',
+          package_format: 'deb',
+          source_package_formats: DEBIAN_SOURCE_FORMATS,
+          repo: true,
+        },
       },
 
       'windows' => {

data/lib/packaging/sign/rpm.rb

@@ -5,7 +5,7 @@ module Pkg::Sign::Rpm
     # To enable support for wrappers around rpm and thus support for gpg-agent
     # rpm signing, we have to be able to tell the packaging repo what binary to
     # use as the rpm signing tool.
-    rpm_command = ENV['RPM'] || Pkg::Util::Tool.find_tool('rpm')
+    rpm_executable = ENV['RPM'] || Pkg::Util::Tool.find_tool('rpm')
 
     # If we're using the gpg agent for rpm signing, we don't want to specify the
     # input for the passphrase, which is what '--passphrase-fd 3' does. However,
@@ -20,12 +20,34 @@ module Pkg::Sign::Rpm
       input_flag = "--passphrase-fd 3"
     end
 
+    # If gpg version is >=2.1, use the gpg1 binary to sign. Otherwise, use the standard sign command.
+    gpg_executable = if gpg_version_greater_than_21?
+                       "%__gpg /usr/bin/gpg1' --define '%__gpg_sign_cmd %{__gpg} gpg1"
+                     else
+                       '%__gpg_sign_cmd %{__gpg} gpg'
+                     end
+
+    # rubocop:disable Lint/NestedPercentLiteral
+    gpg_signing_macro = %W[
+      #{gpg_executable} #{sign_flags} #{input_flag}
+      --batch --no-verbose --no-armor
+      --no-secmem-warning -u %{_gpg_name}
+      -sbo %{__signature_filename} %{__plaintext_filename}
+    ].join(' ')
+    # rubocop:enable Lint/NestedPercentLiteral
+
+    sign_command = %W[
+      #{rpm_executable} #{gpg_check_command}
+      --define '%_gpg_name #{Pkg::Util::Gpg.key}'
+      --define '#{gpg_signing_macro}' --addsign #{rpm}
+    ].join(' ')
+
     # Try this up to 5 times, to allow for incorrect passwords
     Pkg::Util::Execution.retry_on_fail(:times => 5) do
       # This definition of %__gpg_sign_cmd is the default on modern rpm. We
       # accept extra flags to override certain signing behavior for older
       # versions of rpm, e.g. specifying V3 signatures instead of V4.
-      Pkg::Util::Execution.capture3("#{rpm_command} #{gpg_check_command} --define '%_gpg_name #{Pkg::Util::Gpg.key}' --define '%__gpg_sign_cmd %{__gpg} gpg #{sign_flags} #{input_flag} --batch --no-verbose --no-armor --no-secmem-warning -u %{_gpg_name} -sbo %{__signature_filename} %{__plaintext_filename}' --addsign #{rpm}")
+      Pkg::Util::Execution.capture3(sign_command)
     end
   end
 
@@ -112,4 +134,10 @@ module Pkg::Sign::Rpm
       end
     end
   end
+
+  def gpg_version_greater_than_21?
+    gpg_version_output = %x(gpg --version)
+    gpg_version = gpg_version_output.split(' ')[2]
+    Gem::Version.new(gpg_version) >= Gem::Version.new('2.1.0')
+  end
 end

data/lib/packaging/util/net.rb

@@ -394,7 +394,7 @@ module Pkg::Util::Net
     end
 
     def remote_bundle_install_command
-      rvm_ruby_version = ENV['RVM_RUBY_VERSION'] || '2.5.9'
+      rvm_ruby_version = ENV['RVM_RUBY_VERSION'] || '2.7.5'
       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/spec/lib/packaging/paths_spec.rb

@@ -147,6 +147,10 @@ describe 'Pkg::Paths' do
         expect(Pkg::Paths.artifacts_path('ubuntu-20.04-amd64'))
           .to eq('artifacts/FUTURE-puppet7/focal')
       end
+      it 'should be correct for jammy' do
+        expect(Pkg::Paths.artifacts_path('ubuntu-22.04-amd64'))
+          .to eq('artifacts/FUTURE-puppet7/jammy')
+      end
     end
   end
 
@@ -328,6 +332,8 @@ describe 'Pkg::Paths' do
           .to eq('/opt/repository/apt/FUTURE-puppet7/pool/bionic/p/puppet-agent')
         expect(Pkg::Paths.apt_package_base_path('ubuntu-20.04-amd64', 'FUTURE-puppet7', 'puppet-agent'))
           .to eq('/opt/repository/apt/FUTURE-puppet7/pool/focal/p/puppet-agent')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-22.04-amd64', 'FUTURE-puppet7', 'puppet-agent'))
+          .to eq('/opt/repository/apt/FUTURE-puppet7/pool/jammy/p/puppet-agent')
       end
       it 'returns the appropriate nonfinal repo path' do
         allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository-nightlies/apt')

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', 'bullseye', 'buster', 'stretch', 'trusty', 'xenial']
+      codenames = ['focal', 'bionic', 'bullseye', 'buster', 'stretch', 'trusty', 'xenial', 'jammy']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end
@@ -46,6 +46,10 @@ describe 'Pkg::Platforms' do
       expect(Pkg::Platforms.codename_to_platform_version('xenial')).to eq(['ubuntu', '16.04'])
     end
 
+    it 'should return the platform and version corresponding to a given codename' do
+      expect(Pkg::Platforms.codename_to_platform_version('jammy')).to eq(['ubuntu', '22.04'])
+    end
+
     it 'should fail if given nil as a codename' do
       expect{Pkg::Platforms.codename_to_platform_version(nil)}.to raise_error
     end
@@ -53,7 +57,7 @@ describe 'Pkg::Platforms' do
 
   describe '#codename_for_platform_version' do
     it 'should return the codename corresponding to a given platform and version' do
-      expect(Pkg::Platforms.codename_for_platform_version('ubuntu', '16.04')).to eq('xenial')
+      expect(Pkg::Platforms.codename_for_platform_version('ubuntu', '22.04')).to eq('jammy')
     end
   end
 

data/tasks/jenkins.rake

@@ -314,6 +314,14 @@ 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

@@ -243,62 +243,82 @@ namespace :pl do
     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"
+    desc "Sync signed apt repos from #{Pkg::Config.apt_signing_server} to S3 and GCP"
     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]"
+      s3_sync_command = "#{S3_REPO_SYNC} apt.puppetlabs.com"
+      gcp_sync_command = "#{GCP_REPO_SYNC} apt.puppetlabs.com"
+
+      puts "Sync apt repos from #{Pkg::Config.apt_signing_server} to S3 and GCP? [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)
+        Pkg::Util::Net.remote_execute(Pkg::Config.apt_signing_server, s3_sync_command)
+      end
+
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.apt_signing_server, gcp_sync_command)
       end
     end
 
-    desc "Sync signed yum repos from #{Pkg::Config.yum_staging_server} to AWS S3"
+    desc "Sync signed yum repos from #{Pkg::Config.yum_staging_server} to S3 and GCP"
     task :deploy_yum_repo_to_s3 => 'pl:fetch' do
-      sync_command = "#{S3_REPO_SYNC} yum.puppetlabs.com"
-      puts "Sync yum repos from #{Pkg::Config.yum_staging_server} to AWS S3? [y,n]"
+      s3_sync_command = "#{S3_REPO_SYNC} yum.puppetlabs.com"
+      gcp_sync_command = "#{GCP_REPO_SYNC} yum.puppetlabs.com"
+      puts "Sync yum repos from #{Pkg::Config.yum_staging_server} to S3 and GCP? [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)
+        Pkg::Util::Net.remote_execute(Pkg::Config.yum_staging_server, s3_sync_command)
+      end
+
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.yum_staging_server, gcp_sync_command)
       end
     end
 
-    desc "Sync downloads.puppetlabs.com from #{Pkg::Config.staging_server} to AWS S3"
+    desc "Sync downloads.puppetlabs.com from #{Pkg::Config.staging_server} to S3 and GCP"
     task :deploy_downloads_to_s3 => 'pl:fetch' do
-      sync_command = "#{S3_REPO_SYNC} downloads.puppetlabs.com"
-      puts "Sync downloads.puppetlabs.com from #{Pkg::Config.staging_server} to AWS S3? [y,n]"
+      s3_sync_command = "#{S3_REPO_SYNC} downloads.puppetlabs.com"
+      gcp_sync_command = "#{GCP_REPO_SYNC} downloads.puppetlabs.com"
+      puts "Sync downloads.puppetlabs.com from #{Pkg::Config.staging_server} to S3 and GCP? [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)
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, s3_sync_command)
+      end
+
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, gcp_sync_command)
       end
     end
 
-    desc "Sync nightlies.puppet.com from #{Pkg::Config.staging_server} to AWS S3"
+    desc "Sync nightlies.puppet.com from #{Pkg::Config.staging_server} to S3 and GCP"
     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"
+      s3_sync_command = "#{S3_REPO_SYNC} nightlies.puppet.com"
+      gcp_sync_command = "#{S3_REPO_SYNC} nightlies.puppet.com"
+      puts "Syncing nightly builds from #{Pkg::Config.staging_server} to S3 and GCP"
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, s3_sync_command)
+      end
+
       Pkg::Util::Execution.retry_on_fail(times: 3) do
-        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, sync_command)
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, gcp_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
-      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"
+      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
-        %x(#{ssh} #{Pkg::Config.apt_signing_server} '/bin/bash -l -c "#{sync_command_puppet_6}"')
+        Pkg::Util::Net.remote_execute(Pkg::Config.apt_signing_server, 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_7)
       end
     end
     # Keep 'deploy' for backward compatibility

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.106.2
+  version: 0.107.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -323,28 +323,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/repo_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging_spec.rb