beaker-pe 3.6.8 → 3.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e808082867ede5c141a2d6e9def116fcd87d33d1c97ca2a16a401e158794df4
-  data.tar.gz: 96feaaf93f3f957dd331277c3f182cf702aa9c6ec3f1c0212c9381c3ccd819cc
+  metadata.gz: 5bf28b377830e292e4f4e31e158fe194f05efc02863763561459208baa67249e
+  data.tar.gz: b00ca47f6d3868058015566c13681cb49d9b399be2a398f2dad3568ebb5129d2
 SHA512:
-  metadata.gz: 975b99a50a8c499ac0e1afef7bf86939b088073bda0a9ba2236c1851858454ea96b6b9f7a8c9570cd23dc16b4cfb27299527aeb385c33b1a7a969199d873aaef
-  data.tar.gz: 28cbb7db3d6523034643dcd5134509209839a9368de7f274a41bfd1ae72c704f76573d13227efc073335874d85c4bfb9c3c414a5a435703760479cd3d2c7c6e4
+  metadata.gz: 4b340f0b9833a7536dad2a862d0eb85c400c2c1fcc83aa6ee5549a6dbd3490a73cd0c3dc2fd14b89d0c80487a3bf377a84dcb5f11c35e62dc293adc960385991
+  data.tar.gz: 2ea95782b9ade1c357ac4d7a262da2eb4ee0bacb222300a445bac274cef9dd7570a2c761e6fe65c9dd9cb399820cf117ee73e9850df66632c5ad474f6739a1b3

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## [3.6.8](https://github.com/puppetlabs/beaker-pe/tree/3.6.8) (2026-09-17)
+## [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)
 

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
@@ -1285,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.8'
+        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.8
+  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: []