beaker-pe 3.6.3 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03bf3c005114d8ea4bc9e8a2f10b1d25afcd1e3919d09a0a079e925ef35b51ff
-  data.tar.gz: c5507077282d107fdab48081b9736fcfb9a9af8ca600faf316e76fc26ba16067
+  metadata.gz: 17f39948dbc58217035cd4e93469070ac5f35309dc2078fb3995e7edc6558d7f
+  data.tar.gz: 65d1131709c2e886a82dc29f74a7f5a9907f89b2da0fc799233f325954069193
 SHA512:
-  metadata.gz: efb6f1688532acf22b13e6978d4b5cc65df15b2c1e781c886a701deb42206d0985d3bd1af74ddcda09377700777fb83c8278971ef567f682aee71478c278c918
-  data.tar.gz: c9a0843cf5ee0dffa774db34b254214ffc0df72bc54bda36afb4ce89650e6060f481729721f43f67bd2396b0700f61f54d92595114b9314c51205a47a5693708
+  metadata.gz: bef219e4d18d83b1663764cb203cdeb1f857a889d602e4b22d91e1a47c9d96019a169bc8265cf67d485f3082bd67704e7454bc2caf5dff8548bf333be7fcda23
+  data.tar.gz: 420a8f53c44f65636413a31b292b8f510369a740fa619c9c163143e4af02f0de115c7fca9c9bae7cf29d4a63a94a103cf8fd8d26cc4048e6202a4292a1194248

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [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/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'

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.6.3'
+        STRING = '3.6.4'
       end
 
     end

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

@@ -106,6 +106,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

metadata

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