packaging 0.99.74 → 0.99.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b557869f961b5eee771593f169bb4009bc1f918d91356d5cf4ca5c707b9646af
-  data.tar.gz: d2fa55b7c25e670bfd808e5704057be837046d019eac1a828576ef64a615d8fe
+  metadata.gz: d4eba143d4627b1c6ce1eb694894a79987fb4c9eb169a8de3dfe756c037f2cfd
+  data.tar.gz: fc772076ec4a28f57e2a99afb51a29ecba0d20b6b0eea0d32d16f43575f8c8d4
 SHA512:
-  metadata.gz: f97f5983da609cf276e133a0a06dc5512b8bfd5e0d95915577dd47735cec56c109aa6d71d502753ba986b731329cfc6ef398e76eebc7d75dc4ceff8c75dee2a2
-  data.tar.gz: 605405df29954895b08128c45cec7737c65374fd7d3ffb73c5ad0de0a5dd422992df0c10331427792c74c4a815e370dcde28699079674d812e0610d7b9afd640
+  metadata.gz: 5e6b6a56070e12ea898725f030d2cf95b6e04f6ac329f6dab38a20ab9aa765a3a7667f6967373dbde8cf8686403784ad9ca4e49bc83923e260a7c9517e457329
+  data.tar.gz: 5a3cadefed6983b5bcacf0f2abb117b8f2c5aa829dc8567a041b4e4b679d1489d8a2badb80a1c7c1b0a51cbda94ad07d8f00d9378dcaca9ab02b4cd831aeab2f

data/lib/packaging/paths.rb

@@ -16,9 +16,9 @@ module Pkg::Paths
     if source_formats.find { |fmt| path =~ /#{fmt}$/ }
       return Pkg::Platforms.get_attribute_for_platform_version(platform, version, :source_architecture)
     end
-    arches.find { |a| path.include?(a) } || arches[0]
+    arches.find { |a| path.include?(package_arch(platform, a)) } || arches[0]
   rescue
-    arches.find { |a| path.include?(a) } || arches[0]
+    arches.find { |a| path.include?(package_arch(platform, a)) } || arches[0]
   end
 
   # Given a path to an artifact, divine the appropriate platform tag associated
@@ -361,4 +361,15 @@ module Pkg::Paths
     return base_component if component_qualifier == 'repos'
     return full_component
   end
+
+  #for ubuntu-20.04-aarch64, debian package architecture is arm64
+  def package_arch(platform, arch)
+    if platform == 'ubuntu' && arch == 'aarch64'
+      return 'arm64'
+    end
+    arch
+  end
+
+  private :package_arch
+
 end

data/lib/packaging/platforms.rb

@@ -248,7 +248,7 @@ module Pkg
         },
         '20.04' => {
           codename: 'focal',
-          architectures: ['amd64'],
+          architectures: ['amd64', 'aarch64'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,

data/spec/lib/packaging/paths_spec.rb

@@ -5,8 +5,10 @@ describe 'Pkg::Paths' do
     arch_transformations = {
       ['artifacts/aix/6.1/puppet6/ppc/puppet-agent-6.9.0-1.aix6.1.ppc.rpm', 'aix', '6.1'] => 'power',
       ['pkg/el-8-x86_64/puppet-agent-6.9.0-1.el8.x86_64.rpm', 'el', '8'] => 'x86_64',
+      ['pkg/el/8/puppet6/aarch64/puppet-agent-6.5.0.3094.g16b6fa6f-1.el8.aarch64.rpm', 'el', '8'] => 'aarch64',
       ['artifacts/fedora/32/puppet6/x86_64/puppet-agent-6.9.0-1.fc30.x86_64.rpm', 'fedora', '32'] => 'x86_64',
       ['pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb', 'ubuntu', '16.04'] => 'amd64',
+      ['artifacts/deb/focal/puppet6/puppet-agent_6.5.0.3094.g16b6fa6f-1focal_arm64.deb', 'ubuntu', '20.04'] => 'aarch64',
 
       ['artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz', 'ubuntu', '16.04'] => 'source',
       ['artifacts/deb/jessie/PC1/puppetserver_5.0.1.master.orig.tar.gz', 'debian', '8'] => 'source',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.74
+  version: 0.99.75
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -260,27 +260,27 @@ specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
 - spec/lib/packaging_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/git_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/version_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/deb_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/repo_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/repo_spec.rb