beaker-pe 3.6.0 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed7c2a8bf17ddf132b8304f399dc281662a1e5bcf30adccacded869ef4046ec
-  data.tar.gz: fd6a280140761abbc2daac3d441ed0514ddc172f338323467e56bb901f45e2c2
+  metadata.gz: 82fe681f6a5d8f304089ca2dca03e4e9080cbf502b0665e072103dac9e9e4aa9
+  data.tar.gz: 22f5065db00df1654fdc261de80272b0a3719db9fc6e2027b0f92d3e300f90e8
 SHA512:
-  metadata.gz: a66def81ab2b5d734370bf39488a85c9e138918aceae47528adf4af8fc7aa0efe48963341e9e6c2fa06583bf926b6b549291995fde8259e8abe9aa85be20629f
-  data.tar.gz: 371a84424c62700aa73b68c161a3a8ede63accc2a5a909ddaebb5eeeeea199331c46651ee40b2283096a1991f786e67d37b98e311381ff63eb15225c01add041
+  metadata.gz: bc742e9c75813510b30970550c55ec34c56727e1209e2c8a71ea69c89ff1fe1a67e4abd1e4f98ae39ed5d01140f4ad04b6afd795ed264f9c3fd840c749c9ab9a
+  data.tar.gz: 20d4a84d869295af9703cc72e0c2f3f277e8735f0380337f13ea1be23c51a081c6171ae73c5c4edfee98899327490325ed4f5252513b331ff819b968e05c4066

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.6.1](https://github.com/puppetlabs/beaker-pe/tree/3.6.1) (2025-11-21)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.0...3.6.1)
+
+**Implemented enhancements:**
+
+- \[PE-41604\]: Update Solaris 10 SPARC package installation method in PE Utils [\#291](https://github.com/puppetlabs/beaker-pe/pull/291) ([span786](https://github.com/span786))
+
 ## [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)

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

@@ -349,9 +349,40 @@ module Beaker
           # 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}")
+          filename = "puppet-agent-#{vars[:master_aio_version]}-1.sparc.pkg.gz"
+          vanagon_noask = <<-NOASK
+# Write the noask file to a temporary directory
+# please see man -s 4 admin for details about this file:
+# http://www.opensolarisforum.org/man/man4/admin.html
+#
+# The key thing we don\'t want to prompt for are conflicting files.
+# The other nocheck settings are mostly defensive to prevent prompts
+# We _do_ want to check for available free space and abort if there is
+# not enough
+mail=
+# Overwrite already installed instances
+instance=overwrite
+# Do not bother checking for partially installed packages
+partial=nocheck
+# Do not bother checking the runlevel
+runlevel=nocheck
+# Do not bother checking package dependencies (We take care of this)
+idepend=nocheck
+rdepend=nocheck
+# DO check for available free space and abort if there isn\'t enough
+space=quit
+# Do not check for setuid files.
+setuid=nocheck
+# Do not check if files conflict with other packages
+conflict=nocheck
+# We have no action scripts.  Do not check for them.
+action=nocheck
+# Install to the default base directory.
+basedir=default
+NOASK
+
+          host.execute("echo \"#{vanagon_noask}\" > /var/tmp/vanagon-noask")
+          host.execute("curl --output #{filename} #{path}/#{filename} && gunzip -c #{filename} | pkgadd -d /dev/stdin -a /var/tmp/vanagon-noask all")
         end
 
         # Determine the build package to download on a sles-11 (Intel) host, install that package onto the host.
@@ -794,8 +825,10 @@ module Beaker
 
           install_agents_only_on(agents, opts)
 
+          # waitforlock in case install_agents_only_on triggers a puppet run on the
+          # master that is still in progress when we get here
           step "Run puppet a second time on the primary to populate services.conf (PE-19054)" do
-            on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
+            on(master, puppet_agent("-t #{waitforlock_flag(master)}".rstrip), :acceptable_exit_codes => [0,2])
           end
         end
 
@@ -2071,9 +2104,11 @@ EOM
             stop_agent_on(pe_infrastructure, :run_in_parallel => true)
           end
 
+          # waitforlock in case stopping the agent run after stopping the agent service
+          # takes a little longer than usual
           step "First puppet run on infrastructure + postgres node" do
             [master, database, dashboard, pe_postgres].uniq.each do |host|
-              on host, 'puppet agent -t', :acceptable_exit_codes => [0,2]
+              on host, ["puppet agent -t", waitforlock_flag(host)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
             end
           end
 
@@ -2081,13 +2116,15 @@ EOM
             install_agents_only_on(non_infrastructure, opts)
 
             step "Run puppet to setup mcollective and pxp-agent" do
-              on master, 'puppet agent -t', :acceptable_exit_codes => [0,2]
+              on master, ["puppet agent -t", waitforlock_flag(master)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
               run_puppet_on_non_infrastructure_nodes(non_infrastructure)
             end
 
           end
+          # waitforlock in case install_agents_only_on triggers a puppet run on the
+          # master that is still in progress when we get here
           step "Run puppet a second time on the primary to populate services.conf (PE-19054)" do
-            on master, 'puppet agent -t', :acceptable_exit_codes => [0,2]
+            on master, ["puppet agent -t", waitforlock_flag(master)].reject(&:empty?).join(' '), :acceptable_exit_codes => [0,2]
           end
         end
 

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.6.0'
+        STRING = '3.6.2'
       end
 
     end

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

@@ -1692,19 +1692,51 @@ describe ClassMixedWithDSLInstallUtils do
         { :puppet_collection => 'puppet8' }
       }
       let(:stream) { opts[:puppet_collection] }
-      let(:puppet_agent_ver) { '8.15.0.65' }
+      let(:puppet_agent_ver) { '8.16.0' }
       let(:agent_downloads_url) { "http://agent-downloads.delivery.puppetlabs.net/puppet-agent" }
-      let(:master_version) { '8.15.0.65.gd2a4b575d' }
+      let(:master_version) { '8.16.0' }
       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}" }
+      let(:filename) { "puppet-agent-#{master_version}-1.sparc.pkg.gz" }
+      let(:url) { "#{path}/#{filename}" }
+      let(:vanagon_noask) do
+        <<-NOASK
+# Write the noask file to a temporary directory
+# please see man -s 4 admin for details about this file:
+# http://www.opensolarisforum.org/man/man4/admin.html
+#
+# The key thing we don\'t want to prompt for are conflicting files.
+# The other nocheck settings are mostly defensive to prevent prompts
+# We _do_ want to check for available free space and abort if there is
+# not enough
+mail=
+# Overwrite already installed instances
+instance=overwrite
+# Do not bother checking for partially installed packages
+partial=nocheck
+# Do not bother checking the runlevel
+runlevel=nocheck
+# Do not bother checking package dependencies (We take care of this)
+idepend=nocheck
+rdepend=nocheck
+# DO check for available free space and abort if there isn\'t enough
+space=quit
+# Do not check for setuid files.
+setuid=nocheck
+# Do not check if files conflict with other packages
+conflict=nocheck
+# We have no action scripts.  Do not check for them.
+action=nocheck
+# Install to the default base directory.
+basedir=default
+NOASK
+      end
 
       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
+        expect( hosts[5] ).to receive( :execute ).with( "echo \"#{vanagon_noask}\" > /var/tmp/vanagon-noask" ).once
+        expect( hosts[5] ).to receive( :execute ).with( "curl --output #{filename} #{url} && gunzip -c #{filename} | pkgadd -d /dev/stdin -a /var/tmp/vanagon-noask all" ).once
         subject.install_pkg_on_sol10_sparc_host(hosts[5], puppet_agent_ver, opts)
       end
     end

metadata

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