packaging 0.118.0 → 0.120.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b41756b1e69f37e70e46b4cb8efac82a8a64722d01ca578b73657c01b889cd
-  data.tar.gz: 7835d3b37e2090da5265eea585d9e4fb0f68847ec4eb467301408213917227e7
+  metadata.gz: 7b18ea5a4fbf5f94f741269f71ca9a48f682f589244d901c7d1b47bf6b8a65a0
+  data.tar.gz: d946ded712a46f846434a7362077556847254425b6be295afd60b71ed34df2fe
 SHA512:
-  metadata.gz: 6a6bb1684deca5aa04bf1e8fefaaebc9b64be735675d8d69fb284f2d3b6d49fdeaba59fa28e07aaa2037e5d24db713c0e046e107c3c41b07c84b67c6de3add58
-  data.tar.gz: e0016808e5792f0399e9aef46ff539a8b3ac30954188f9221a222c84a1bc0c0167499e0aa77bbf6e3d47d2c0d27163bbc51176901bebe75d70f835b5f658c3d3
+  metadata.gz: 5f19e8d594c0aa4d784ff04d38614c55d4ca3c47f6be2cf2758fad1577bc9d6f442b25dc74e1806431773893dd94b3e90fe548f5f7e09fad862547136e8c9c97
+  data.tar.gz: 9b9f26cd0d61b7e5d1020284098076a3d5863814594fb2944cdbca437f30740983a1ab14aa9470437b30bcb4dc32ce79fcd0f3f536af6982a465955d297a6973

data/lib/packaging/platforms.rb

@@ -36,6 +36,22 @@ module Pkg
           signature_format: 'v4',
           repo: true,
         },
+        '7' => {
+          architectures: ['aarch64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
+        '2' => {
+          architectures: ['aarch64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
       },
 
       'debian' => {
@@ -117,6 +133,14 @@ module Pkg
           signature_format: 'v4',
           repo: true,
         },
+        '40' => {
+          architectures: ['x86_64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
       },
 
       'osx' => {

data/lib/packaging/sign/ips.rb

@@ -0,0 +1,13 @@
+module Pkg::Sign::Ips
+  module_function
+
+  def sign(ips_dir = 'pkg')
+    packages = Dir["#{ips_dir}/**/*.p5p"]
+    return if packages.empty?
+
+    Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
+    packages.each do |p5p_package|
+      Pkg::Util::Gpg.sign_file(p5p_package)
+    end
+  end
+end

data/lib/packaging/sign.rb

@@ -1,6 +1,7 @@
 module Pkg::Sign
   require 'packaging/sign/deb'
   require 'packaging/sign/dmg'
+  require 'packaging/sign/ips'
   require 'packaging/sign/msi'
   require 'packaging/sign/rpm'
 end

data/tasks/nightly_repos.rake

@@ -39,8 +39,7 @@ namespace :pl do
       Pkg::Rpm::Repo.sign_repos('repos')
       Pkg::Deb::Repo.sign_repos('repos', 'Apt repository for signed builds')
       Pkg::Sign::Dmg.sign('repos') unless Dir['repos/apple/**/*.dmg'].empty?
-      ### RE-16211: we should put this back and unify with the code in sign.rake
-      # Pkg::Sign::Ips.sign('repos') unless Dir['repos/solaris/11/**/*.p5p'].empty?
+      Pkg::Sign::Ips.sign('repos') unless Dir['repos/solaris/11/**/*.p5p'].empty?
       Pkg::Sign::Msi.sign('repos') unless Dir['repos/windows/**/*.msi'].empty?
     end
 

data/tasks/sign.rake

@@ -45,13 +45,8 @@ namespace :pl do
   desc "Sign ips package, defaults to PL key, pass GPG_KEY to override"
   task :sign_ips, :root_dir do |_t, args|
     ips_dir = args.root_dir || $DEFAULT_DIRECTORY
-    packages = Dir["#{ips_dir}/**/*.p5p"]
-    next if packages.empty?
-
-    Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
-    packages.each do |p5p_package|
-      Pkg::Util::Gpg.sign_file p5p_package
-    end
+    next if Dir["#{ips_dir}/**/*.p5p"].empty?
+    Pkg::Sign::Ips.sign(ips_dir)
   end
 
   desc "Sign built gems, defaults to PL key, pass GPG_KEY to override or edit build_defaults"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.118.0
+  version: 0.120.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: apt_stage_artifacts
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: artifactory
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +166,7 @@ files:
 - lib/packaging/sign.rb
 - lib/packaging/sign/deb.rb
 - lib/packaging/sign/dmg.rb
+- lib/packaging/sign/ips.rb
 - lib/packaging/sign/msi.rb
 - lib/packaging/sign/rpm.rb
 - lib/packaging/tar.rb
@@ -306,28 +293,28 @@ signing_key:
 specification_version: 4
 summary: Puppet by Perforce packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
 - spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging_spec.rb