Skip to content

Commit

Permalink
Install puppet-agent directly on Ubuntu 24.04
Browse files Browse the repository at this point in the history
Ubuntu 24.04 ships a puppet-agent 8 package which uses different paths than
ours. To ensure we install the correct puppet-agent package, install the
specific puppet-agent artifact.
  • Loading branch information
joshcooper committed May 30, 2024
1 parent a774be9 commit 147b2d0
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion lib/beaker-puppet/install_utils/puppet5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,12 @@ def install_from_build_data_url(project_name, sha_yaml_url, local_hosts = nil)

install_targets.each do |host|
artifact_url, repoconfig_url = host_urls(host, build_details, base_url)
if repoconfig_url.nil?
if host.platform.variant == 'ubuntu' && host.platform.version.to_f >= 24.04
# install the specific artifact we built, not based on how its repos are configured
tmp_file = host.tmpfile('puppet-agent')
on(host, "curl -L --output #{tmp_file} #{artifact_url}")
host.install_local_package(tmp_file)
elsif repoconfig_url.nil?
install_artifact_on(host, artifact_url, project_name)
else
install_repo_configs_on(host, repoconfig_url)
Expand Down

0 comments on commit 147b2d0

Please sign in to comment.