packaging 0.110.1 → 0.112.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f531bbfb5a05625e55cdf14b09928314d13999addf12b7c77ddb8ed954c187e1
-  data.tar.gz: f7fc4ca10a227835456ac481b71b14adc916d55e218dc975bcb0c3e6ebd92859
+  metadata.gz: e4edacd0d8bab96ae4a5ee44c23a120819524f0eb4faca14954f08e2f71a64ea
+  data.tar.gz: a608f83cb2eeabc40b366a792f5aea5ac9b05b3cece5db5939ee33e8fc725600
 SHA512:
-  metadata.gz: 98aa70e3f509f803d1e0e2d65d2121ab81197b9d412ea57ab8c3e8750d68374e87b81a89d10d2597b5b4b58f01873985c21a47047c9df70c63cafae7d9e3d855
-  data.tar.gz: 60d5a3851e2765a421327cb7ac105e4f132b1d96d91731eef10da0e39a44976c940360f6ae5effe9869cc230924d1b1d09dce8162cbd0a762826a7ef06a02a0c
+  metadata.gz: 322dd7199e20f7840d6cd42ad936944955ec6b1399b3f573fc9c60cea3aea390f5609b981931eea9c8437dfeb8ab4d855fbd7f33b9f3a989307a0947b90075c5
+  data.tar.gz: 91363da9e94bf818c67a3d4d073327f9c9878d7b20492e9bdc2cb3f95473b1023f7dc9f7758ab381fd08560b33a20b626361ac50f314882a53e5c5f459d8aaaa

data/lib/packaging/paths.rb

@@ -365,7 +365,7 @@ module Pkg::Paths
 
   #for ubuntu-20.04-aarch64, debian package architecture is arm64
   def package_arch(platform, arch)
-    if platform == 'ubuntu' && arch == 'aarch64'
+    if %w[debian ubuntu].include?(platform) && arch == 'aarch64'
       return 'arm64'
     end
     arch

data/lib/packaging/platforms.rb

@@ -27,6 +27,17 @@ module Pkg
         },
       },
 
+      'amazon' => {
+        '2023' => {
+          architectures: ['x86_64', 'aarch64'],
+          source_architecture: 'SRPMS',
+          package_format: 'rpm',
+          source_package_formats: ['src.rpm'],
+          signature_format: 'v4',
+          repo: true,
+        },
+      },
+
       'debian' => {
         '10' => {
           codename: 'buster',
@@ -38,7 +49,7 @@ module Pkg
         },
         '11' => {
           codename: 'bullseye',
-          architectures: ['amd64'],
+          architectures: ['amd64', 'aarch64'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,
@@ -72,7 +83,7 @@ module Pkg
           repo: true,
         },
         '9' => {
-          architectures: ['x86_64'],
+          architectures: ['x86_64', 'aarch64'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],

data/spec/lib/packaging/platforms_spec.rb

@@ -4,7 +4,7 @@ describe 'Pkg::Platforms' do
   describe '#by_package_format' do
     it 'should return an array of platforms that use a given format' do
       deb_platforms = ['debian', 'ubuntu']
-      rpm_platforms = ['aix', 'el', 'fedora', 'redhatfips', 'sles']
+      rpm_platforms = ['aix', 'amazon', 'el', 'fedora', 'redhatfips', 'sles']
       expect(Pkg::Platforms.by_package_format('deb')).to match_array(deb_platforms)
       expect(Pkg::Platforms.by_package_format('rpm')).to match_array(rpm_platforms)
     end
@@ -19,7 +19,7 @@ describe 'Pkg::Platforms' do
 
   describe '#supported_platforms' do
     it 'should return all supported platforms' do
-      platforms = ['aix', 'debian', 'el', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
+      platforms = ['aix', 'amazon', 'debian', 'el', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
       expect(Pkg::Platforms.supported_platforms).to match_array(platforms)
     end
   end

metadata

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