beaker-pe 3.4.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c0d8e3ba1b40ece8b4ce09269696496f8127b94cbd024a561be03c4329eeea8
-  data.tar.gz: efda94caab15d1fe1a46a7529053dc8c46f22a769740ead35be71e3ab57a1eab
+  metadata.gz: eed7c2a8bf17ddf132b8304f399dc281662a1e5bcf30adccacded869ef4046ec
+  data.tar.gz: fd6a280140761abbc2daac3d441ed0514ddc172f338323467e56bb901f45e2c2
 SHA512:
-  metadata.gz: 9d5f4990007e80482f754be9733776583188b57065e5ce0dbd0e5db27aeaa20c86351098e7409fae2dc63627ee9094effb1953634096937678c06a24eb788ccc
-  data.tar.gz: d50685bbd3c0dec24a7205b5ad009b91a94cd5b8681680a7660d8c33d045b54f64c3de01a3bbb09e98e2b1d8b7a2cb86b9a5cf56b48f50e3ef58e5cedd2f049a
+  metadata.gz: a66def81ab2b5d734370bf39488a85c9e138918aceae47528adf4af8fc7aa0efe48963341e9e6c2fa06583bf926b6b549291995fde8259e8abe9aa85be20629f
+  data.tar.gz: 371a84424c62700aa73b68c161a3a8ede63accc2a5a909ddaebb5eeeeea199331c46651ee40b2283096a1991f786e67d37b98e311381ff63eb15225c01add041

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [3.6.0](https://github.com/puppetlabs/beaker-pe/tree/3.6.0) (2025-11-20)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.5.0...3.6.0)
+
+**Implemented enhancements:**
+
+- \[PE-42706\]: Add support for installing Puppet agent on Solaris 10 SPARC hosts [\#289](https://github.com/puppetlabs/beaker-pe/pull/289) ([span786](https://github.com/span786))
+
+## [3.5.0](https://github.com/puppetlabs/beaker-pe/tree/3.5.0) (2025-04-15)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.4.0...3.5.0)
+
+**Implemented enhancements:**
+
+- \(PE-40793\) Follow https->>http redirects [\#287](https://github.com/puppetlabs/beaker-pe/pull/287) ([tvpartytonight](https://github.com/tvpartytonight))
+
 ## [3.4.0](https://github.com/puppetlabs/beaker-pe/tree/3.4.0) (2025-03-12)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.3.1...3.4.0)

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

@@ -325,6 +325,35 @@ module Beaker
           end
         end
 
+        # Helper method to get common variables for agent package installation
+        # @param [String] puppet_agent_ver The puppet agent version
+        # @param [Hash{Symbol=>Symbol, String}] opts The options
+        # @return [Hash] Hash containing agent_downloads_url, master_aio_version, and stream
+        # @api private
+        def agent_package_common_vars(puppet_agent_ver, opts)
+          {
+            agent_downloads_url: "http://agent-downloads.delivery.puppetlabs.net/puppet-agent",
+            master_aio_version: puppet_fact(master, 'aio_agent_build'),
+            stream: opts[:puppet_collection] || "puppet#{puppet_agent_ver[0]}"
+          }
+        end
+
+        # Determine the build package to download on a solaris-10-sparc host, install that package onto the host.
+        # Assumed file name format: puppet-agent-8.15.0-1.sparc.pkg.gz
+        # 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 sol10-sparc host to download and install the package on.
+        # @param  [Hash{Symbol=>Symbol, String}] opts The options
+        # @api private
+        def install_pkg_on_sol10_sparc_host(host, puppet_agent_ver, opts)
+          # Since sol10-sparc 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/solaris/10/#{vars[:stream]}"
+          filename = "puppet-agent-#{vars[:master_aio_version]}-1.sparc"
+          extension = ".pkg.gz"
+          host.install_package("#{path}/#{filename}#{extension}")
+        end
+
         # Determine the build package to download on a sles-11 (Intel) host, install that package onto the host.
         # Assumed file name format: puppet-agent-7.29.1.26.gf344eeefa-1.sles11.x86_64.rpm.
         # This method should be called after puppet is installed on the master since it relies on the master
@@ -334,11 +363,9 @@ module Beaker
         # @api private
         def install_rpm_on_sles11_host(host, puppet_agent_ver, opts)
           # Since sles11 builds are not available in PE, download from agent-downloads.
-          agent_downloads_url = "http://agent-downloads.delivery.puppetlabs.net/puppet-agent"
-          master_aio_version = puppet_fact(master, 'aio_agent_build')
-          stream = opts[:puppet_collection] || "puppet#{puppet_agent_ver[0]}"
-          path = "#{agent_downloads_url}/#{puppet_agent_ver}/repos/sles/11/#{stream}/x86_64"
-          filename = "puppet-agent-#{master_aio_version}-1.sles11.x86_64"
+          vars = agent_package_common_vars(puppet_agent_ver, opts)
+          path = "#{vars[:agent_downloads_url]}/#{puppet_agent_ver}/repos/sles/11/#{vars[:stream]}/x86_64"
+          filename = "puppet-agent-#{vars[:master_aio_version]}-1.sles11.x86_64"
           extension = ".rpm"
           host.install_package_with_rpm("#{path}/#{filename}#{extension}")
         end
@@ -1099,7 +1126,12 @@ module Beaker
 
             onhost_copied_download = File.join(onhost_copy_base, download_file)
             onhost_copied_file = File.join(onhost_copy_base, release_file)
-            fetch_http_file(release_path, download_file, copy_dir_local)
+            download_uri = URI.parse("#{release_path}/#{download_file}")
+            if (redirect = Net::HTTP.start(download_uri.host) { |http| http.head(download_uri.path).response['location'] })
+              fetch_http_file(redirect.chomp("/#{download_file}"), download_file, copy_dir_local)
+            else
+              fetch_http_file(release_path, download_file, copy_dir_local)
+            end
             scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
 
             if variant == 'windows'
@@ -1169,6 +1201,8 @@ module Beaker
               }
               if host['platform'] =~ /sles-11/
                 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)
               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.4.0'
+        STRING = '3.6.0'
       end
 
     end

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

@@ -30,14 +30,15 @@ describe ClassMixedWithDSLInstallUtils do
   let(:basic_hosts)   { make_hosts( { :pe_ver => '3.0',
                                       :platform => 'linux',
                                       :roles => [ 'agent' ],
-                                      :type => 'pe'}, 5 ) }
+                                      :type => 'pe'}, 6 ) }
   let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
                         basic_hosts[1][:platform] = 'windows'
                         basic_hosts[2][:platform] = 'osx-10.9-x86_64'
                         basic_hosts[3][:platform] = 'eos'
                         basic_hosts[4][:platform] = 'sles'
+                        basic_hosts[5][:platform] = 'solaris'
                         basic_hosts  }
-  let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3], hosts[4] ] }
+  let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3], hosts[4], hosts[5] ] }
   let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
                                                 :pe_ver => '3.0',
                                                 :type => 'pe',
@@ -60,6 +61,10 @@ describe ClassMixedWithDSLInstallUtils do
                                                :pe_ver => '3.0',
                                                :type => 'pe',
                                                :working_dir => '/tmp'} ) }
+  let(:solaris10host) { make_host( 'sol10', { :platform => 'solaris-10-sparc',
+                                                 :pe_ver => '3.0',
+                                                 :type => 'pe',
+                                                 :working_dir => '/tmp'} ) }
   let(:lei_hosts)     { make_hosts( { :pe_ver => '3.0',
                                       :platform => 'linux',
                                       :roles => [ 'agent' ],
@@ -82,6 +87,25 @@ describe ClassMixedWithDSLInstallUtils do
     subject.logger = logger
   end
 
+  context '#install_puppet_agent_pe_promoted_repo_on' do
+
+    it 'will read a redirect if necessary' do
+      # Only test the function under test attempts to read the redirect; skip
+      # the rest of function by bailing early after that attempt has been verified
+      # by raising this special exception
+      class SpecialRedirectTestException < StandardError
+      end
+      opts[:pe_promoted_builds_url] = 'https://mycooltesturl.com'
+      allow(Net::HTTP).to receive(:start).with('mycooltesturl.com').and_return('http://mycooltesturlredirect.com/puppet-agent-el-9-x86_64.tar.gz')
+      allow(subject).to receive(:fetch_http_file).with('http://mycooltesturlredirect.com', 'puppet-agent-el-9-x86_64.tar.gz', 'tmp/repo_configs/el').and_raise(SpecialRedirectTestException)
+      allow(subject).to receive(:sanitize_opts).and_return(opts)
+
+      test_host = Beaker::Host.create("test", {platform: 'el-9-x86_64'}, opts)
+      test_host['platform'] = Beaker::Platform.new(test_host['platform'])
+      expect{subject.install_puppet_agent_pe_promoted_repo_on([test_host], opts)}.to raise_error(SpecialRedirectTestException)
+    end
+  end
+
   context '#prep_host_for_upgrade' do
 
     it 'sets per host options before global options' do
@@ -1653,18 +1677,40 @@ describe ClassMixedWithDSLInstallUtils do
       let(:filename) { "puppet-agent-#{master_version}-1.sles11.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( hosts[4] ).to receive( :install_package_with_rpm ).with( url ).once
         subject.install_rpm_on_sles11_host(hosts[4], puppet_agent_ver, opts)
       end
     end
 
+    context 'install pkg.gz file in solaris host' do
+      let(:opts) {
+        { :puppet_collection => 'puppet8' }
+      }
+      let(:stream) { opts[:puppet_collection] }
+      let(:puppet_agent_ver) { '8.15.0.65' }
+      let(:agent_downloads_url) { "http://agent-downloads.delivery.puppetlabs.net/puppet-agent" }
+      let(:master_version) { '8.15.0.65.gd2a4b575d' }
+      let(:path) { "#{agent_downloads_url}/#{puppet_agent_ver}/repos/solaris/10/#{stream}" }
+      let(:filename) { "puppet-agent-#{master_version}-1.sparc" }
+      let(:extension) { '.pkg.gz' }
+      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( hosts[5] ).to receive( :install_package ).with( url ).once
+        subject.install_pkg_on_sol10_sparc_host(hosts[5], puppet_agent_ver, opts)
+      end
+    end
+
     it 'can perform a simple installation' do
-      expect(subject).to receive(:get_mco_setting).and_return({}).twice
+      expect(subject).to receive(:get_mco_setting).and_return({}).thrice
       allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
       allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
       allow( subject ).to receive( :fetch_pe ).and_return( true )

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Puppetlabs
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -307,7 +306,6 @@ homepage: https://github.com/puppetlabs/beaker-pe
 licenses:
 - Apache2
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -322,8 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Beaker PE DSL Helpers!
 test_files: []