beaker-pe 3.6.7 → 3.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c64a23179a869b41ceb2ea32740a983e8a27172939f4347b6401d94265c1f26
-  data.tar.gz: 1f961918eda0b697d7246d4abef2cf451f742a5f816a9667e3d2259ca415d7b9
+  metadata.gz: 5bf28b377830e292e4f4e31e158fe194f05efc02863763561459208baa67249e
+  data.tar.gz: b00ca47f6d3868058015566c13681cb49d9b399be2a398f2dad3568ebb5129d2
 SHA512:
-  metadata.gz: '07931522f4f5f30eb04235539a1b9d3d30b3cc16eb551bb7d78b5eed7f010b62b9bcd07de1b15b66be5419bdf273b44c097710484b8976597b8b1ce67efab31c'
-  data.tar.gz: 27cd5ed3c62caa3899b980fd3f63c0c3c5c0c5f5f52e1dca4601d50ba70a7c1132b2dc07a56a019caff526e83cb9c74523dd25c6321cc26fb0463c95344acc7a
+  metadata.gz: 4b340f0b9833a7536dad2a862d0eb85c400c2c1fcc83aa6ee5549a6dbd3490a73cd0c3dc2fd14b89d0c80487a3bf377a84dcb5f11c35e62dc293adc960385991
+  data.tar.gz: 2ea95782b9ade1c357ac4d7a262da2eb4ee0bacb222300a445bac274cef9dd7570a2c761e6fe65c9dd9cb399820cf117ee73e9850df66632c5ad474f6739a1b3

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [3.6.9](https://github.com/puppetlabs/beaker-pe/tree/3.6.9) (2026-10-20)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.8...3.6.9)
+
+**Implemented enhancements:**
+
+- \(PE-47138\) Add el-7 puppet-agent install support via agent-downloads [\#316](https://github.com/puppetlabs/beaker-pe/pull/316) ([shubhamshinde360](https://github.com/shubhamshinde360))
+
+## [3.6.8](https://github.com/puppetlabs/beaker-pe/tree/3.6.8) (2026-09-21)
+
+[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 +124,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 +144,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

@@ -408,6 +408,22 @@ NOASK
           host.install_package_with_rpm("#{path}/#{filename}#{extension}")
         end
 
+        # Determine the build package to download on an el-7 (Intel) host, install that package onto the host.
+        # Assumed file name format: puppet-agent-9.1.1.13-1.el7.x86_64.rpm.
+        # This method should be called after puppet is installed on the master since it relies on the master
+        # telling it the puppet agent version to form the download URL.
+        # @param [Host] host The el-7 host to download and install the package on.
+        # @param  [Hash{Symbol=>Symbol, String}] opts The options
+        # @api private
+        def install_rpm_on_el7_host(host, puppet_agent_ver, opts)
+          # Since el-7 builds are not available in PE, download from agent-downloads.
+          vars = agent_package_common_vars(puppet_agent_ver, opts)
+          path = "#{vars[:agent_downloads_url]}/#{puppet_agent_ver}/repos/el/7/#{vars[:stream]}/x86_64"
+          filename = "puppet-agent-#{vars[:master_aio_version]}-1.el7.x86_64"
+          extension = ".rpm"
+          host.install_package_with_rpm("#{path}/#{filename}#{extension}")
+        end
+
         #Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
         #Assumed file name format: puppet-enterprise-3.3.0-rc1-559-g97f0833.msi
         # @param [Host] host The windows host to download/upload and unpack PE onto
@@ -510,13 +526,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 +544,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'
@@ -1268,6 +1301,8 @@ NOASK
                 install_rpm_on_sles11_host(host, install_params[:puppet_agent_version], opts)
               elsif host['platform'] =~ /solaris-10-sparc/
                 install_pkg_on_sol10_sparc_host(host, install_params[:puppet_agent_version], opts)
+              elsif host['packaging_platform'] =~ /^el-7-x86_64/ && !version_is_less(host['pe_ver'] || opts[:pe_ver], '2025.12')
+                install_rpm_on_el7_host(host, install_params[:puppet_agent_version], opts)
               else
                 install_params.delete(:pe_promoted_builds_url) if install_params[:pe_promoted_builds_url].nil?
                 install_puppet_agent_pe_promoted_repo_on(host, install_params)

data/lib/beaker-pe/version.rb

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

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -72,6 +72,10 @@ describe ClassMixedWithDSLInstallUtils do
                                                :pe_ver => '3.0',
                                                :type => 'pe',
                                                :working_dir => '/tmp'} ) }
+  let(:el7host)       { make_host( 'el7', { :platform => 'el-7-x86_64',
+                                               :pe_ver => '3.0',
+                                               :type => 'pe',
+                                               :working_dir => '/tmp'} ) }
   let(:solaris10host) { make_host( 'sol10', { :platform => 'solaris-10-sparc',
                                                  :pe_ver => '3.0',
                                                  :type => 'pe',
@@ -1898,6 +1902,28 @@ NOASK
       end
     end
 
+    context "install rpm file in el-7 host" do
+      let(:opts) {
+        { :puppet_collection => 'puppet9' }
+      }
+      let(:stream) { opts[:puppet_collection] }
+      let(:puppet_agent_ver) { '9.1.1.30' }
+      let(:agent_downloads_url) { "http://agent-downloads.delivery.puppetlabs.net/puppet-agent" }
+      let(:master_version) { '9.1.1.30' }
+      let(:path) { "#{agent_downloads_url}/#{puppet_agent_ver}/repos/el/7/#{stream}/x86_64" }
+      let(:filename) { "puppet-agent-#{master_version}-1.el7.x86_64" }
+      let(:extension) { '.rpm' }
+      let(:url) { "#{path}/#{filename}#{extension}" }
+
+      it "generates the correct url to download the package" do
+        allow( subject ).to receive( :puppet_fact ).and_return( master_version )
+        allow( subject ).to receive( :master ).and_return( {} )
+
+        expect( el7host ).to receive( :install_package_with_rpm ).with( url ).once
+        subject.install_rpm_on_el7_host(el7host, puppet_agent_ver, opts)
+      end
+    end
+
     it 'can perform a simple installation' do
       expect(subject).to receive(:get_mco_setting).and_return({}).thrice
       allow( subject ).to receive( :verify_network_resources).with(hosts, nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.6.7
+  version: 3.6.9
 platform: ruby
 authors:
 - Puppetlabs
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Beaker PE DSL Helpers!
 test_files: []