packaging 0.106.3 → 0.107.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72bd49df5579d8096b08bbde6347b7bc1165d4547167311d2c46899f87e02941
-  data.tar.gz: b2babb4ba9191542f5f3aef1954ef0fc47684dca1065b80a1cf3ef267b94b931
+  metadata.gz: a52b5e4526f37d1bf4ebacf7a4c8de7c8b6cf2fb96ababbc1873384381e42903
+  data.tar.gz: 626f5a46015f53bac68d7dc29fd712efa5a5e7180079444c7f6aecda91ce520c
 SHA512:
-  metadata.gz: 62800f36692c45ecffbbb8ba09b1f9423b7b86034dbb2012e8475662debd01e444e220f0f55585c6a85064b1faf6cc9ec8b490f36a9a3efb9421d5703eca2187
-  data.tar.gz: 6b5639ae1693e6b241758c2045c6e5a7b70833d0f5140aa6fc4042bfab15f414014c2b60e5411c30b9dd2babe6c8f678951aaf33a27782c93a865d111e4e7214
+  metadata.gz: cf0029e52dd115687b71974542ab056555ebaa5d0f8886c4a01ff14f072b6dea4cd3ad509ea66b8dd8ea0c36bf324b27e5cdb289e86202c0c15bd8c7d64cb890
+  data.tar.gz: 4e8cde5da7d1fe12d6677582419c4b7e15a0fbe9d499fbfb29fc6e0e82e6c41583ca254d7c4ca861e959d22d1ed5f0a1270b02c0899ae58c230addc9d3015eba

data/lib/packaging/platforms.rb

@@ -211,6 +211,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/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/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.3
+  version: 0.107.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-06-14 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/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/deb_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/jenkins_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/misc_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging_spec.rb