packaging 0.99.26 → 0.99.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5810e9e91e457e13c6bdb3cf1f359ec97b749cba0933fad16b3d8ae81062ec1
-  data.tar.gz: ca897c180d03a19d424c98887492f4abe304b92412d619f0cc18b6fb4bfbe531
+  metadata.gz: 72842503acd393e9129186a1235bdec5aea380c708a98561bc6e1e287da49a69
+  data.tar.gz: 8aef453e782a037360af9a077601a5680d0032f8089122e421ba5f847fb56cf4
 SHA512:
-  metadata.gz: c97021edfd95563f9850f43ffbd1637d9eb52f62fe9f30dd258e495c0a1d656292540e4a6544d8ee065dc6bc877ceebe123e7c8a7a59df9fb5c692841812d8f3
-  data.tar.gz: ad003d4081350531add1551efb18f9c30206f62a8cbc42c3cdc871ccf7e463d1534a68e4cc83b71f2597f6dcd049d9f21a273ee7c76a3fee8be8d3d85af68a32
+  metadata.gz: df8a46368da7362f3b731f3acbf6a88370690b4c508cfdbbd0c56bb0f5ab710e0315963a1b5904d037d323800ed996214a154cfcd51b3da13548018999edce65
+  data.tar.gz: ff1a17d1ddd74a9bd5aa4804afe6e1287e701c134d82c9dde07e44df61626c83c9ff0830900f8484a57755b4c55b953e51681957c553512d9c91b33ea642ce47

data/lib/packaging/config.rb

@@ -80,11 +80,15 @@ module Pkg
           artifacts = artifacts.split("\n")
           data = {}
           artifacts.each do |artifact|
-            tag = Pkg::Paths.tag_from_artifact_path(artifact)
+            # We need to preserve the original tag to make sure we look for
+            # fedora repo configs in the 1.10.x branch of puppet-agent in
+            # the correct place. For 5.x and 6.x release streams the f prefix
+            # has been removed and so tag will equal original_tag
+            original_tag = Pkg::Paths.tag_from_artifact_path(artifact)
 
             # Remove the f-prefix from the fedora platform tag keys so that
             # beaker can rely on consistent keys once we rip out the f for good
-            tag = tag.sub(/fedora-f/, 'fedora-')
+            tag = original_tag.sub(/fedora-f/, 'fedora-')
 
             data[tag] ||= {}
 
@@ -118,7 +122,8 @@ module Pkg
             when 'deb'
               repo_config = "../repo_configs/deb/pl-#{self.project}-#{self.ref}-#{Pkg::Platforms.get_attribute(tag, :codename)}.list"
             when 'rpm'
-              repo_config = "../repo_configs/rpm/pl-#{self.project}-#{self.ref}-#{tag}.repo" unless tag.include? 'aix'
+              # Using original_tag here to not break legacy fedora repo targets
+              repo_config = "../repo_configs/rpm/pl-#{self.project}-#{self.ref}-#{original_tag}.repo" unless tag.include? 'aix'
             when 'swix', 'svr4', 'ips', 'dmg', 'msi'
               # No repo_configs for these platforms, so do nothing.
             else

data/spec/fixtures/config/ext/build_defaults.yaml

@@ -1 +1 @@
-../params.yaml
+spec/fixtures/config/ext/../params.yaml

data/spec/fixtures/config/ext/project_data.yaml

@@ -1 +1 @@
-../params.yaml
+spec/fixtures/config/ext/../params.yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.26
+  version: 0.99.27
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -223,7 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation