packaging 0.99.26 → 0.99.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 72842503acd393e9129186a1235bdec5aea380c708a98561bc6e1e287da49a69
|
|
4
|
+
data.tar.gz: 8aef453e782a037360af9a077601a5680d0032f8089122e421ba5f847fb56cf4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: df8a46368da7362f3b731f3acbf6a88370690b4c508cfdbbd0c56bb0f5ab710e0315963a1b5904d037d323800ed996214a154cfcd51b3da13548018999edce65
|
|
7
|
+
data.tar.gz: ff1a17d1ddd74a9bd5aa4804afe6e1287e701c134d82c9dde07e44df61626c83c9ff0830900f8484a57755b4c55b953e51681957c553512d9c91b33ea642ce47
|
data/lib/packaging/config.rb
CHANGED
|
@@ -80,11 +80,15 @@ module Pkg
|
|
|
80
80
|
artifacts = artifacts.split("\n")
|
|
81
81
|
data = {}
|
|
82
82
|
artifacts.each do |artifact|
|
|
83
|
-
tag
|
|
83
|
+
# We need to preserve the original tag to make sure we look for
|
|
84
|
+
# fedora repo configs in the 1.10.x branch of puppet-agent in
|
|
85
|
+
# the correct place. For 5.x and 6.x release streams the f prefix
|
|
86
|
+
# has been removed and so tag will equal original_tag
|
|
87
|
+
original_tag = Pkg::Paths.tag_from_artifact_path(artifact)
|
|
84
88
|
|
|
85
89
|
# Remove the f-prefix from the fedora platform tag keys so that
|
|
86
90
|
# beaker can rely on consistent keys once we rip out the f for good
|
|
87
|
-
tag =
|
|
91
|
+
tag = original_tag.sub(/fedora-f/, 'fedora-')
|
|
88
92
|
|
|
89
93
|
data[tag] ||= {}
|
|
90
94
|
|
|
@@ -118,7 +122,8 @@ module Pkg
|
|
|
118
122
|
when 'deb'
|
|
119
123
|
repo_config = "../repo_configs/deb/pl-#{self.project}-#{self.ref}-#{Pkg::Platforms.get_attribute(tag, :codename)}.list"
|
|
120
124
|
when 'rpm'
|
|
121
|
-
|
|
125
|
+
# Using original_tag here to not break legacy fedora repo targets
|
|
126
|
+
repo_config = "../repo_configs/rpm/pl-#{self.project}-#{self.ref}-#{original_tag}.repo" unless tag.include? 'aix'
|
|
122
127
|
when 'swix', 'svr4', 'ips', 'dmg', 'msi'
|
|
123
128
|
# No repo_configs for these platforms, so do nothing.
|
|
124
129
|
else
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
spec/fixtures/config/ext/../params.yaml
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
spec/fixtures/config/ext/../params.yaml
|
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.27
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet Labs
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-04-
|
|
11
|
+
date: 2019-04-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rspec
|
|
@@ -223,7 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
223
223
|
- !ruby/object:Gem::Version
|
|
224
224
|
version: '0'
|
|
225
225
|
requirements: []
|
|
226
|
-
|
|
226
|
+
rubyforge_project:
|
|
227
|
+
rubygems_version: 2.7.6
|
|
227
228
|
signing_key:
|
|
228
229
|
specification_version: 4
|
|
229
230
|
summary: Puppet Labs' packaging automation
|