packaging 0.99.74 → 0.99.75
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/packaging/paths.rb +13 -2
- data/lib/packaging/platforms.rb +1 -1
- data/spec/lib/packaging/paths_spec.rb +2 -0
- metadata +14 -14
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d4eba143d4627b1c6ce1eb694894a79987fb4c9eb169a8de3dfe756c037f2cfd
|
4
|
+
data.tar.gz: fc772076ec4a28f57e2a99afb51a29ecba0d20b6b0eea0d32d16f43575f8c8d4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5e6b6a56070e12ea898725f030d2cf95b6e04f6ac329f6dab38a20ab9aa765a3a7667f6967373dbde8cf8686403784ad9ca4e49bc83923e260a7c9517e457329
|
7
|
+
data.tar.gz: 5a3cadefed6983b5bcacf0f2abb117b8f2c5aa829dc8567a041b4e4b679d1489d8a2badb80a1c7c1b0a51cbda94ad07d8f00d9378dcaca9ab02b4cd831aeab2f
|
data/lib/packaging/paths.rb
CHANGED
@@ -16,9 +16,9 @@ module Pkg::Paths
|
|
16
16
|
if source_formats.find { |fmt| path =~ /#{fmt}$/ }
|
17
17
|
return Pkg::Platforms.get_attribute_for_platform_version(platform, version, :source_architecture)
|
18
18
|
end
|
19
|
-
arches.find { |a| path.include?(a) } || arches[0]
|
19
|
+
arches.find { |a| path.include?(package_arch(platform, a)) } || arches[0]
|
20
20
|
rescue
|
21
|
-
arches.find { |a| path.include?(a) } || arches[0]
|
21
|
+
arches.find { |a| path.include?(package_arch(platform, a)) } || arches[0]
|
22
22
|
end
|
23
23
|
|
24
24
|
# Given a path to an artifact, divine the appropriate platform tag associated
|
@@ -361,4 +361,15 @@ module Pkg::Paths
|
|
361
361
|
return base_component if component_qualifier == 'repos'
|
362
362
|
return full_component
|
363
363
|
end
|
364
|
+
|
365
|
+
#for ubuntu-20.04-aarch64, debian package architecture is arm64
|
366
|
+
def package_arch(platform, arch)
|
367
|
+
if platform == 'ubuntu' && arch == 'aarch64'
|
368
|
+
return 'arm64'
|
369
|
+
end
|
370
|
+
arch
|
371
|
+
end
|
372
|
+
|
373
|
+
private :package_arch
|
374
|
+
|
364
375
|
end
|
data/lib/packaging/platforms.rb
CHANGED
@@ -5,8 +5,10 @@ describe 'Pkg::Paths' do
|
|
5
5
|
arch_transformations = {
|
6
6
|
['artifacts/aix/6.1/puppet6/ppc/puppet-agent-6.9.0-1.aix6.1.ppc.rpm', 'aix', '6.1'] => 'power',
|
7
7
|
['pkg/el-8-x86_64/puppet-agent-6.9.0-1.el8.x86_64.rpm', 'el', '8'] => 'x86_64',
|
8
|
+
['pkg/el/8/puppet6/aarch64/puppet-agent-6.5.0.3094.g16b6fa6f-1.el8.aarch64.rpm', 'el', '8'] => 'aarch64',
|
8
9
|
['artifacts/fedora/32/puppet6/x86_64/puppet-agent-6.9.0-1.fc30.x86_64.rpm', 'fedora', '32'] => 'x86_64',
|
9
10
|
['pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb', 'ubuntu', '16.04'] => 'amd64',
|
11
|
+
['artifacts/deb/focal/puppet6/puppet-agent_6.5.0.3094.g16b6fa6f-1focal_arm64.deb', 'ubuntu', '20.04'] => 'aarch64',
|
10
12
|
|
11
13
|
['artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz', 'ubuntu', '16.04'] => 'source',
|
12
14
|
['artifacts/deb/jessie/PC1/puppetserver_5.0.1.master.orig.tar.gz', 'debian', '8'] => 'source',
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: packaging
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.99.
|
4
|
+
version: 0.99.75
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppet Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-12-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -260,27 +260,27 @@ specification_version: 4
|
|
260
260
|
summary: Puppet Labs' packaging automation
|
261
261
|
test_files:
|
262
262
|
- spec/lib/packaging_spec.rb
|
263
|
-
- spec/lib/packaging/
|
264
|
-
- spec/lib/packaging/tar_spec.rb
|
265
|
-
- spec/lib/packaging/artifactory_spec.rb
|
263
|
+
- spec/lib/packaging/rpm/repo_spec.rb
|
266
264
|
- spec/lib/packaging/paths_spec.rb
|
267
|
-
- spec/lib/packaging/
|
265
|
+
- spec/lib/packaging/deb/repo_spec.rb
|
268
266
|
- spec/lib/packaging/util/gpg_spec.rb
|
269
|
-
- spec/lib/packaging/util/
|
267
|
+
- spec/lib/packaging/util/os_spec.rb
|
270
268
|
- spec/lib/packaging/util/file_spec.rb
|
271
|
-
- spec/lib/packaging/util/
|
272
|
-
- spec/lib/packaging/util/
|
269
|
+
- spec/lib/packaging/util/ship_spec.rb
|
270
|
+
- spec/lib/packaging/util/git_spec.rb
|
273
271
|
- spec/lib/packaging/util/execution_spec.rb
|
274
|
-
- spec/lib/packaging/util/jenkins_spec.rb
|
275
272
|
- spec/lib/packaging/util/misc_spec.rb
|
273
|
+
- spec/lib/packaging/util/rake_utils_spec.rb
|
274
|
+
- spec/lib/packaging/util/version_spec.rb
|
276
275
|
- spec/lib/packaging/util/git_tag_spec.rb
|
277
|
-
- spec/lib/packaging/util/
|
276
|
+
- spec/lib/packaging/util/jenkins_spec.rb
|
278
277
|
- spec/lib/packaging/util/net_spec.rb
|
279
278
|
- spec/lib/packaging/deb_spec.rb
|
280
|
-
- spec/lib/packaging/
|
279
|
+
- spec/lib/packaging/config_spec.rb
|
280
|
+
- spec/lib/packaging/artifactory_spec.rb
|
281
281
|
- spec/lib/packaging/gem_spec.rb
|
282
|
+
- spec/lib/packaging/tar_spec.rb
|
282
283
|
- spec/lib/packaging/sign_spec.rb
|
284
|
+
- spec/lib/packaging/repo_spec.rb
|
283
285
|
- spec/lib/packaging/platforms_spec.rb
|
284
|
-
- spec/lib/packaging/config_spec.rb
|
285
286
|
- spec/lib/packaging/retrieve_spec.rb
|
286
|
-
- spec/lib/packaging/repo_spec.rb
|