From 0dd9021acad5789e9f2067334da7e144d7c8d1ba Mon Sep 17 00:00:00 2001 From: Saurabh Pandit Date: Mon, 4 Nov 2024 22:20:27 +0530 Subject: [PATCH] (maint): Added support for v2 agent download url --- lib/beaker-pe/install/pe_utils.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/beaker-pe/install/pe_utils.rb b/lib/beaker-pe/install/pe_utils.rb index fc12e13..d848b41 100644 --- a/lib/beaker-pe/install/pe_utils.rb +++ b/lib/beaker-pe/install/pe_utils.rb @@ -342,7 +342,7 @@ def install_rpm_on_sles11_host(host, puppet_agent_ver, opts) 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 @@ -1076,7 +1076,11 @@ def install_puppet_agent_pe_promoted_repo_on(hosts, opts) pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0.0-rc1' opts = sanitize_opts(opts) opts[:download_url] = - "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos" + if Gem::Version.new(pe_ver) > Gem::Version.new('2023.7.0') + "#{opts[:pe_promoted_builds_url]}/v2/agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos" + else + "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos" + end opts[:copy_base_local] ||= File.join('tmp', 'repo_configs') opts[:copy_dir_external] ||= host.external_copy_base opts[:puppet_collection] ||= puppet_collection_for(:puppet_agent, opts[:puppet_agent_version])