beaker-pe 3.6.7 → 3.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c64a23179a869b41ceb2ea32740a983e8a27172939f4347b6401d94265c1f26
-  data.tar.gz: 1f961918eda0b697d7246d4abef2cf451f742a5f816a9667e3d2259ca415d7b9
+  metadata.gz: 8e808082867ede5c141a2d6e9def116fcd87d33d1c97ca2a16a401e158794df4
+  data.tar.gz: 96feaaf93f3f957dd331277c3f182cf702aa9c6ec3f1c0212c9381c3ccd819cc
 SHA512:
-  metadata.gz: '07931522f4f5f30eb04235539a1b9d3d30b3cc16eb551bb7d78b5eed7f010b62b9bcd07de1b15b66be5419bdf273b44c097710484b8976597b8b1ce67efab31c'
-  data.tar.gz: 27cd5ed3c62caa3899b980fd3f63c0c3c5c0c5f5f52e1dca4601d50ba70a7c1132b2dc07a56a019caff526e83cb9c74523dd25c6321cc26fb0463c95344acc7a
+  metadata.gz: 975b99a50a8c499ac0e1afef7bf86939b088073bda0a9ba2236c1851858454ea96b6b9f7a8c9570cd23dc16b4cfb27299527aeb385c33b1a7a969199d873aaef
+  data.tar.gz: 28cbb7db3d6523034643dcd5134509209839a9368de7f274a41bfd1ae72c704f76573d13227efc073335874d85c4bfb9c3c414a5a435703760479cd3d2c7c6e4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.6.8](https://github.com/puppetlabs/beaker-pe/tree/3.6.8) (2026-09-17)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.7...3.6.8)
+
+**Merged pull requests:**
+
+- \(PE-32680\) Fix GPG key refresh for PE 2023.8.0 and earlier [\#308](https://github.com/puppetlabs/beaker-pe/pull/308) ([cthorn42](https://github.com/cthorn42))
+
 ## [3.6.7](https://github.com/puppetlabs/beaker-pe/tree/3.6.7) (2026-08-14)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.6...3.6.7)
@@ -108,19 +116,19 @@
 
 ## [2.19.0](https://github.com/puppetlabs/beaker-pe/tree/2.19.0) (2024-06-21)
 
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.2.0...2.19.0)
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.18.0...2.19.0)
 
 **Implemented enhancements:**
 
 - \(PE-38685\) Beaker 6 upgrade [\#281](https://github.com/puppetlabs/beaker-pe/pull/281) ([tlehman](https://github.com/tlehman))
 
-## [3.2.0](https://github.com/puppetlabs/beaker-pe/tree/3.2.0) (2024-06-11)
+## [2.18.0](https://github.com/puppetlabs/beaker-pe/tree/2.18.0) (2024-06-11)
 
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.18.0...3.2.0)
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.2.0...2.18.0)
 
-## [2.18.0](https://github.com/puppetlabs/beaker-pe/tree/2.18.0) (2024-06-11)
+## [3.2.0](https://github.com/puppetlabs/beaker-pe/tree/3.2.0) (2024-06-11)
 
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.1.0...2.18.0)
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.1.0...3.2.0)
 
 **Implemented enhancements:**
 
@@ -128,19 +136,19 @@
 
 ## [3.1.0](https://github.com/puppetlabs/beaker-pe/tree/3.1.0) (2024-05-22)
 
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.17.0...3.1.0)
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.1...3.1.0)
 
 **Merged pull requests:**
 
 - \(PE-37784\) Remove upper bound for beaker-puppet [\#273](https://github.com/puppetlabs/beaker-pe/pull/273) ([nmburgan](https://github.com/nmburgan))
 
-## [2.17.0](https://github.com/puppetlabs/beaker-pe/tree/2.17.0) (2024-04-10)
+## [3.0.1](https://github.com/puppetlabs/beaker-pe/tree/3.0.1) (2024-04-10)
 
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.1...2.17.0)
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.17.0...3.0.1)
 
-## [3.0.1](https://github.com/puppetlabs/beaker-pe/tree/3.0.1) (2024-04-10)
+## [2.17.0](https://github.com/puppetlabs/beaker-pe/tree/2.17.0) (2024-04-10)
 
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.16.1...3.0.1)
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.16.1...2.17.0)
 
 ## [2.16.1](https://github.com/puppetlabs/beaker-pe/tree/2.16.1) (2024-03-19)
 

data/lib/beaker-pe/install/pe_utils.rb

@@ -510,13 +510,13 @@ NOASK
         end
 
         #PE-32680, GPG expired on older PE versions, need to update with a new GPG key on the primary server
-        #only affects PE versions 2019.8.4 and earlier, and only needed for debian, ubuntu, and sles agent platforms
+        #only affects PE versions 2023.8.0 and earlier, and only needed for debian, ubuntu, and sles agent platforms
         # @param [Host] host to see if we need to update the gpg key
         # @param [String] location of the GPG key we intend to overwrite
-        # If someone is using this gem and is not on the PE private network, they need to download the new private GPG key and host
-        # it somewhere, then set the URL as an enviromental variable GPG_URL.
+        # Defaults to Puppet's public release key (same key, renewed self-signature); override
+        # via the GPG_URL environment variable if a different source is needed.
         def gpg_key_overwrite(host, location)
-          gpg_url = ENV['GPG_URL'] || 'https://artifactory.delivery.puppetlabs.net/artifactory/generic__local/extended_gpg_key.asc'
+          gpg_url = ENV['GPG_URL'] || 'https://yum.puppet.com/RPM-GPG-KEY-puppet'
           case location
           when 'tarball'
             path_to_gpg_key = "#{host['working_dir']}/#{host['dist']}/packages/GPG-KEY-puppet"
@@ -528,9 +528,26 @@ NOASK
             raise(StandardError, "gpg_key_overwrite requires a valid location: tarball, or pe_repo. #{location} was supplied")
           end
 
-          if (host['roles'].include?('master') || host['roles'].include?('pe_postgres')) && version_is_less(host[:pe_ver], '2019.8.5') && hosts.any? {|agent| agent['platform'] =~ /(debian)|(ubuntu)|(sles)/}
+          if (host['roles'].include?('master') || host['roles'].include?('pe_postgres')) && version_is_less(host[:pe_ver], '2023.8.1') && hosts.any? {|agent| agent['platform'] =~ /(debian)|(ubuntu)|(sles)/}
+            # Some PE releases also ship a separately-dated copy of this key alongside the
+            # undated one (e.g. GPG-KEY-puppet-2025-04-06), which frictionless install scripts
+            # may reference directly. Find any such siblings before we remove the undated file,
+            # so we can refresh them with the same content too.
+            gpg_key_dir = File.dirname(path_to_gpg_key)
+            gpg_key_basename = File.basename(path_to_gpg_key)
+            dated_gpg_keys = on(host, "ls -1 #{gpg_key_dir}/#{gpg_key_basename}-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] 2>/dev/null", :acceptable_exit_codes => [0,1,2]).stdout.split("\n")
+
             on(host, "rm -f #{path_to_gpg_key}")
-            on(host, "curl #{gpg_url} --output #{path_to_gpg_key}")
+            # The puppet-agent tarball fetch above already uses retry_on to survive network
+            # blips; do the same here so a transient curl failure doesn't abort the whole run.
+            retry_on(host, "curl --fail #{gpg_url} --output #{path_to_gpg_key}", {
+              desired_exit_codes: [0],
+              max_retries: 3,
+              verbose: 'true'
+            })
+            unless dated_gpg_keys.empty?
+              on(host, dated_gpg_keys.map { |dated_gpg_key| "cp #{path_to_gpg_key} #{dated_gpg_key}" }.join(' && '))
+            end
             if location == 'pe_repo'
               gpg_key_overwrite(host, 'pe_repo_env')
             elsif location == 'pe_repo_env'

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.6.7'
+        STRING = '3.6.8'
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.6.7
+  version: 3.6.8
 platform: ruby
 authors:
 - Puppetlabs