beaker-pe 3.6.3 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03bf3c005114d8ea4bc9e8a2f10b1d25afcd1e3919d09a0a079e925ef35b51ff
-  data.tar.gz: c5507077282d107fdab48081b9736fcfb9a9af8ca600faf316e76fc26ba16067
+  metadata.gz: 330fb055e63900ac5bdefd9d48a122eb35a13872c6a820bb072fe88409415ab7
+  data.tar.gz: 17588df9d4e67e74cab914118a35457d66aad62397c6c1194c41eb1ba51e967c
 SHA512:
-  metadata.gz: efb6f1688532acf22b13e6978d4b5cc65df15b2c1e781c886a701deb42206d0985d3bd1af74ddcda09377700777fb83c8278971ef567f682aee71478c278c918
-  data.tar.gz: c9a0843cf5ee0dffa774db34b254214ffc0df72bc54bda36afb4ce89650e6060f481729721f43f67bd2396b0700f61f54d92595114b9314c51205a47a5693708
+  metadata.gz: 50576aa57b1e28945226720abe0f959cf1c05b56c29e84f61a215b461bb171728b27c0b03eaea233b9da69fc948938536c23ee8057bc7c54f5647c1ef6d6fd94
+  data.tar.gz: 8e5c488e4dbfd2a940f78a7bf434efc5d9fac63ffece679e07d5a078a616c807c480fe234b53d3710bc0b67c447362382abecefa25e14139f5762ba2195bd0b9

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [3.6.5](https://github.com/puppetlabs/beaker-pe/tree/3.6.5) (2026-07-29)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.4...3.6.5)
+
+**Implemented enhancements:**
+
+- (PE-45366) Add pe_run_in_parallel option, serial by default on macOS [#309](https://github.com/puppetlabs/beaker-pe/pull/309) ([Magisus](https://github.com/Magisus))
+
+## [3.6.4](https://github.com/puppetlabs/beaker-pe/tree/3.6.4) (2026-07-23)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.3...3.6.4)
+
+**Fixed bugs:**
+
+- [PE-41009]: Fall back to agent-downloads when promoted agent is missing from the public mirror [#306](https://github.com/puppetlabs/beaker-pe/pull/306) ([Magisus](https://github.com/Magisus))
+
+## [3.6.3](https://github.com/puppetlabs/beaker-pe/tree/3.6.3) (2026-07-16)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.2...3.6.3)
+
+**Fixed bugs:**
+
+- [PE-45082]: Broaden is_expected_pe_postgres_failure? allowlist [#303](https://github.com/puppetlabs/beaker-pe/pull/303) ([steveax](https://github.com/steveax))
+
+## [3.6.2](https://github.com/puppetlabs/beaker-pe/tree/3.6.2) (2026-06-05)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.1...3.6.2)
+
+**Fixed bugs:**
+
+- Add waitforlock flag to second puppet runs to prevent lock collisions [#300](https://github.com/puppetlabs/beaker-pe/pull/300) ([jonathannewman](https://github.com/jonathannewman))
+
 ## [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)

data/README.md

@@ -31,6 +31,27 @@ of key concepts.
 involved in addressing key problems and use-cases. For instance, checkout our
 [How-to Install Puppet Enterprise doc](docs/how_to/install_puppet_enterprise.md).
 
+## Configuration
+
+### Running install/upgrade steps serially (`pe_run_in_parallel`)
+
+Several PE install/upgrade steps act on many hosts at once by `fork()`ing a child
+process per host, each with its own SSH connection. **On macOS, forking a Ruby
+process that has already used `Net::SSH` deadlocks the child**, so these steps hang
+until beaker's watchdog kills them (`RuntimeError: Child process ran longer than
+timeout of 1800`). This does not happen on Linux/CI.
+
+Because of this, beaker-pe defaults to running these steps **serially on macOS** and
+**in parallel on every other platform**. You can override the default either way:
+
+- Option: set `pe_run_in_parallel: true` (or `false`) in your beaker options.
+- Env var: `export BEAKER_PE_RUN_IN_PARALLEL=1` (or `0`) before running beaker.
+
+Precedence, highest first: the `BEAKER_PE_RUN_IN_PARALLEL` env var, then the
+`pe_run_in_parallel` option, then the platform default (`false` on macOS, `true`
+elsewhere). For the env var, `1`, `true`, or `yes` force parallel; `0`, `false`, or
+`no` force serial.
+
 ## Upgrading from 0.y to 1.y?
 
 If you've used beaker-pe previously (during the 0.y versions), you'll

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

@@ -43,6 +43,13 @@ module Beaker
         NODE_CONF_PATH = "#{MEEP_DATA_DIR}/conf.d/nodes"
         BEAKER_MEEP_TMP = "pe_conf"
 
+        # Base URL for promoted puppet-agent packages on the internal
+        # build-output host. Newer promoted agents (>= 8.11.0) are no longer
+        # published to the public pm.puppet.com / S3 mirror; el/windows installs
+        # fall back here. This is the same host the sles-11 and
+        # solaris-10-sparc install paths already use.
+        AGENT_DOWNLOADS_URL = 'http://agent-downloads.delivery.puppetlabs.net/puppet-agent'.freeze
+
         # @!macro [new] common_opts
         #   @param [Hash{Symbol=>String}] opts Options to alter execution.
         #   @option opts [Boolean] :silent (false) Do not produce log output
@@ -332,7 +339,7 @@ module Beaker
         # @api private
         def agent_package_common_vars(puppet_agent_ver, opts)
           {
-            agent_downloads_url: "http://agent-downloads.delivery.puppetlabs.net/puppet-agent",
+            agent_downloads_url: AGENT_DOWNLOADS_URL,
             master_aio_version: puppet_fact(master, 'aio_agent_build'),
             stream: opts[:puppet_collection] || "puppet#{puppet_agent_ver[0]}"
           }
@@ -1113,6 +1120,36 @@ NOASK
           raise RuntimeError("#{host.class} not one of Beaker::(Windows|Mac|Unix)::Host")
         end
 
+        # Fetch a promoted puppet-agent package into copy_dir_local. Tries the
+        # primary (pm.puppet.com/S3) promoted mirror first; if that returns a
+        # 404 — newer agents (>= 8.11.0) are no longer published there — fall
+        # back to the internal agent-downloads host. Any non-404 failure is
+        # re-raised unchanged.
+        #
+        # @param [String] release_path Primary base URL, already including the
+        #   /v2/agent/<pe_ver>/<agent_ver>/repos suffix and release_path_end
+        # @param [String] release_path_end Platform suffix ('' unix, '/windows')
+        # @param [String] download_file The package file name
+        # @param [String] copy_dir_local Local destination directory
+        # @param [String] agent_version The puppet-agent version being installed
+        # @api private
+        def fetch_promoted_agent_with_fallback(release_path, release_path_end, download_file, copy_dir_local, agent_version)
+          download_uri = URI.parse("#{release_path}/#{download_file}")
+          redirect = Net::HTTP.start(download_uri.host) { |http| http.head(download_uri.path).response['location'] }
+          primary_base = redirect ? redirect.chomp("/#{download_file}") : release_path
+
+          begin
+            fetch_http_file(primary_base, download_file, copy_dir_local)
+          rescue => e
+            raise unless e.message.include?('404')
+
+            fallback_base = "#{AGENT_DOWNLOADS_URL}/#{agent_version}/repos#{release_path_end}"
+            logger.warn("Promoted puppet-agent not found at #{primary_base}/#{download_file} (#{e.message}); " \
+                        "falling back to #{fallback_base}/#{download_file}")
+            fetch_http_file(fallback_base, download_file, copy_dir_local)
+          end
+        end
+
         # Install shared repo of the puppet-agent on the given host(s).  Downloaded from
         # location of the form PE_PROMOTED_BUILDS_URL/PE_VER/puppet-agent/AGENT_VERSION/repo
         #
@@ -1159,12 +1196,7 @@ NOASK
 
             onhost_copied_download = File.join(onhost_copy_base, download_file)
             onhost_copied_file = File.join(onhost_copy_base, release_file)
-            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
+            fetch_promoted_agent_with_fallback(release_path, release_path_end, download_file, copy_dir_local, opts[:puppet_agent_version])
             scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
 
             if variant == 'windows'
@@ -1487,12 +1519,27 @@ NOASK
             (host['platform'] =~ /windows-2008r2/ && (!version_is_less(host['pe_ver'], '2016.4.99') && version_is_less(host['pe_ver'], '2016.5.99') && !version_is_less(host['pe_ver'], '3.99')))
         end
 
+        # Whether PE install/upgrade steps that act on many hosts should fork and
+        # run in parallel. Forking + Net::SSH deadlocks on macOS, so the default is
+        # serial there and parallel everywhere else; a developer can override either
+        # way. Precedence, highest first:
+        #   BEAKER_PE_RUN_IN_PARALLEL env var > :pe_run_in_parallel option > default
+        #   (false on macOS, true elsewhere)
+        # @api private
+        # @return [Boolean]
+        def pe_run_in_parallel?
+          env = ENV['BEAKER_PE_RUN_IN_PARALLEL']
+          return %w[1 true yes].include?(env.downcase) unless env.nil? || env.empty?
+          opt = options[:pe_run_in_parallel]
+          opt.nil? ? (RUBY_PLATFORM !~ /darwin/) : !!opt
+        end
+
         # Runs puppet on all nodes, unless they have the roles: master,database,console/dashboard
         # @param [Array<Host>] hosts The sorted hosts to install or upgrade PE on
         def run_puppet_on_non_infrastructure_nodes(all_hosts)
           pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'pe_compiler', 'dashboard', 'database']}, all_hosts)
           non_infrastructure = all_hosts.reject{|host| pe_infrastructure.include? host}
-          on non_infrastructure, puppet_agent('-t'), :acceptable_exit_codes => [0,2], :run_in_parallel => true
+          on non_infrastructure, puppet_agent('-t'), :acceptable_exit_codes => [0,2], :run_in_parallel => pe_run_in_parallel?
         end
 
         # Whether or not PE should be managing the puppet service on agents.
@@ -2101,7 +2148,7 @@ EOM
           end
 
           step "Stop agent service on infrastructure nodes" do
-            stop_agent_on(pe_infrastructure, :run_in_parallel => true)
+            stop_agent_on(pe_infrastructure, :run_in_parallel => pe_run_in_parallel?)
           end
 
           # waitforlock in case stopping the agent run after stopping the agent service
@@ -2456,7 +2503,7 @@ EOM
             end
 
              step "Install agents" do
-               block_on(agent_nodes, {:run_in_parallel => true}) do |host|
+               block_on(agent_nodes, {:run_in_parallel => pe_run_in_parallel?}) do |host|
                  install_ca_cert_on(host, opts)
                  on(host, installer_cmd(host, opts))
                end
@@ -2468,13 +2515,13 @@ EOM
              end
 
              step "Stop puppet agents to avoid interfering with tests" do
-               stop_agent_on(agent_nodes, :run_in_parallel => true)
+               stop_agent_on(agent_nodes, :run_in_parallel => pe_run_in_parallel?)
              end
 
              # waitforlock in case stopping the agent run after stopping the agent service
              # takes a little longer than usual
              step "Run puppet on all agent nodes" do
-               block_on(agent_nodes, {:run_in_parallel => true}) do |host|
+               block_on(agent_nodes, {:run_in_parallel => pe_run_in_parallel?}) do |host|
                  on host, puppet_agent("-t #{waitforlock_flag(host)}"), :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.3'
+        STRING = '3.6.5'
       end
 
     end

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

@@ -25,6 +25,17 @@ class ClassMixedWithDSLInstallUtils
 end
 
 describe ClassMixedWithDSLInstallUtils do
+  # Neutralize BEAKER_PE_RUN_IN_PARALLEL and pin RUBY_PLATFORM to a non-macOS value
+  # for every example in this file, so that pre-existing specs asserting the default
+  # (:run_in_parallel => true) are not affected by whatever a developer happens to
+  # have exported in their shell or by running the suite on a Mac (where the default
+  # is serial). Examples that exercise the macOS default stub RUBY_PLATFORM to darwin.
+  before do
+    allow(ENV).to receive(:[]).and_call_original
+    allow(ENV).to receive(:[]).with('BEAKER_PE_RUN_IN_PARALLEL').and_return(nil)
+    stub_const('RUBY_PLATFORM', 'x86_64-linux')
+  end
+
   let(:presets)       { Beaker::Options::Presets.new }
   let(:opts)          { presets.presets.merge(presets.env_vars) }
   let(:basic_hosts)   { make_hosts( { :pe_ver => '3.0',
@@ -106,6 +117,73 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  context 'AGENT_DOWNLOADS_URL' do
+    it 'points at the internal agent-downloads host' do
+      expect(Beaker::DSL::InstallUtils::PEUtils::AGENT_DOWNLOADS_URL)
+        .to eq('http://agent-downloads.delivery.puppetlabs.net/puppet-agent')
+    end
+  end
+
+  context '#fetch_promoted_agent_with_fallback' do
+    let(:download_file) { 'puppet-agent-el-8-x86_64.tar.gz' }
+    let(:release_path)  { 'https://pm.puppet.com/v2/agent/2023.8.3/8.11.0/repos' }
+    let(:s3_base)       { 'https://s3.amazonaws.com/puppet-agents/puppet-agent/8.11.0/repos' }
+    let(:agent_dl_base) { 'http://agent-downloads.delivery.puppetlabs.net/puppet-agent/8.11.0/repos' }
+
+    before do
+      # HEAD on the pm.puppet.com URL resolves (via 302) to the S3 promoted mirror.
+      allow(Net::HTTP).to receive(:start).with('pm.puppet.com')
+        .and_return("#{s3_base}/#{download_file}")
+    end
+
+    it 'fetches from the primary mirror when the package is present' do
+      expect(subject).to receive(:fetch_http_file)
+        .with(s3_base, download_file, 'tmp/repo_configs/el')
+      expect(subject).not_to receive(:fetch_http_file)
+        .with(a_string_including('agent-downloads'), anything, anything)
+
+      subject.fetch_promoted_agent_with_fallback(release_path, '', download_file, 'tmp/repo_configs/el', '8.11.0')
+    end
+
+    it 'falls back to agent-downloads on a 404' do
+      allow(subject).to receive(:fetch_http_file)
+        .with(s3_base, download_file, 'tmp/repo_configs/el')
+        .and_raise("Failed to fetch_remote_file '#{s3_base}/#{download_file}' (404 Not Found)")
+      expect(subject).to receive(:fetch_http_file)
+        .with(agent_dl_base, download_file, 'tmp/repo_configs/el')
+
+      subject.fetch_promoted_agent_with_fallback(release_path, '', download_file, 'tmp/repo_configs/el', '8.11.0')
+    end
+
+    it 're-raises non-404 fetch errors without falling back' do
+      allow(subject).to receive(:fetch_http_file)
+        .with(s3_base, download_file, 'tmp/repo_configs/el')
+        .and_raise('Failed to fetch_remote_file (500 Server Error)')
+      expect(subject).not_to receive(:fetch_http_file)
+        .with(a_string_including('agent-downloads'), anything, anything)
+
+      expect {
+        subject.fetch_promoted_agent_with_fallback(release_path, '', download_file, 'tmp/repo_configs/el', '8.11.0')
+      }.to raise_error(/500/)
+    end
+
+    it 'preserves the /windows suffix in the fallback URL' do
+      win_file         = 'puppet-agent-x64.msi'
+      win_release_path = 'https://pm.puppet.com/v2/agent/2023.8.3/8.11.0/repos/windows'
+      win_s3_base      = "#{s3_base}/windows"
+      win_dl_base      = "#{agent_dl_base}/windows"
+      allow(Net::HTTP).to receive(:start).with('pm.puppet.com')
+        .and_return("#{win_s3_base}/#{win_file}")
+      allow(subject).to receive(:fetch_http_file)
+        .with(win_s3_base, win_file, 'tmp/repo_configs/windows')
+        .and_raise("Failed to fetch_remote_file '#{win_s3_base}/#{win_file}' (404 Not Found)")
+      expect(subject).to receive(:fetch_http_file)
+        .with(win_dl_base, win_file, 'tmp/repo_configs/windows')
+
+      subject.fetch_promoted_agent_with_fallback(win_release_path, '/windows', win_file, 'tmp/repo_configs/windows', '8.11.0')
+    end
+  end
+
   context '#prep_host_for_upgrade' do
 
     it 'sets per host options before global options' do
@@ -545,6 +623,35 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe '#run_puppet_on_non_infrastructure_nodes parallel wiring' do
+    let(:master)   { make_host('master', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => ['master', 'database', 'dashboard']) }
+    let(:el_agent) { make_host('agent', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => ['frictionless']) }
+
+    before do
+      allow(ENV).to receive(:[]).and_call_original
+      allow(ENV).to receive(:[]).with('BEAKER_PE_RUN_IN_PARALLEL').and_return(nil)
+    end
+
+    it 'passes run_in_parallel => false when the option disables it' do
+      subject.options[:pe_run_in_parallel] = false
+      expect(subject).to receive(:on).with(
+        [el_agent],
+        anything,
+        hash_including(:run_in_parallel => false)
+      ).once
+      subject.run_puppet_on_non_infrastructure_nodes([master, el_agent])
+    end
+
+    it 'passes run_in_parallel => true by default' do
+      expect(subject).to receive(:on).with(
+        [el_agent],
+        anything,
+        hash_including(:run_in_parallel => true)
+      ).once
+      subject.run_puppet_on_non_infrastructure_nodes([master, el_agent])
+    end
+  end
+
   describe 'install_via_msi?' do
     it 'returns true if pe_version is before PE 2016.4.0' do
       the_host = winhost.dup
@@ -594,6 +701,71 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe '#pe_run_in_parallel?' do
+    before do
+      # Default: pretend the env var is unset unless a specific example sets it.
+      allow(ENV).to receive(:[]).and_call_original
+      allow(ENV).to receive(:[]).with('BEAKER_PE_RUN_IN_PARALLEL').and_return(nil)
+    end
+
+    context 'with no option and no env var' do
+      it 'defaults to true off macOS' do
+        stub_const('RUBY_PLATFORM', 'x86_64-linux')
+        expect(subject.send(:pe_run_in_parallel?)).to eq(true)
+      end
+
+      it 'defaults to false on macOS' do
+        stub_const('RUBY_PLATFORM', 'x86_64-darwin21')
+        expect(subject.send(:pe_run_in_parallel?)).to eq(false)
+      end
+    end
+
+    context 'with the :pe_run_in_parallel option' do
+      it 'returns false when the option is false' do
+        subject.options[:pe_run_in_parallel] = false
+        expect(subject.send(:pe_run_in_parallel?)).to eq(false)
+      end
+
+      it 'returns true when the option is true' do
+        subject.options[:pe_run_in_parallel] = true
+        expect(subject.send(:pe_run_in_parallel?)).to eq(true)
+      end
+    end
+
+    context 'with the BEAKER_PE_RUN_IN_PARALLEL env var set' do
+      %w[1 true yes TRUE Yes].each do |truthy|
+        it "returns true for #{truthy.inspect}" do
+          allow(ENV).to receive(:[]).with('BEAKER_PE_RUN_IN_PARALLEL').and_return(truthy)
+          expect(subject.send(:pe_run_in_parallel?)).to eq(true)
+        end
+      end
+
+      %w[0 false no off].each do |falsey|
+        it "returns false for #{falsey.inspect}" do
+          allow(ENV).to receive(:[]).with('BEAKER_PE_RUN_IN_PARALLEL').and_return(falsey)
+          expect(subject.send(:pe_run_in_parallel?)).to eq(false)
+        end
+      end
+
+      it 'overrides the option (env true beats option false)' do
+        subject.options[:pe_run_in_parallel] = false
+        allow(ENV).to receive(:[]).with('BEAKER_PE_RUN_IN_PARALLEL').and_return('1')
+        expect(subject.send(:pe_run_in_parallel?)).to eq(true)
+      end
+
+      it 'overrides the option (env false beats option true)' do
+        subject.options[:pe_run_in_parallel] = true
+        allow(ENV).to receive(:[]).with('BEAKER_PE_RUN_IN_PARALLEL').and_return('0')
+        expect(subject.send(:pe_run_in_parallel?)).to eq(false)
+      end
+
+      it 'falls through to the default when the env var is empty' do
+        allow(ENV).to receive(:[]).with('BEAKER_PE_RUN_IN_PARALLEL').and_return('')
+        expect(subject.send(:pe_run_in_parallel?)).to eq(true)
+      end
+    end
+  end
+
   describe 'higgs installer' do
     let(:host) { unixhost }
     let(:higgs_regex) { %r{cd .* ; nohup \./puppet-enterprise-installer <<<#{higgs_answer} .*} }

metadata

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