Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always use puppet-agent for Debian 12+ & Ubuntu 23.04+ #37

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Always use puppet-agent for Debian 12+ & Ubuntu 23.04+ #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f5fe9b
Always use puppet-agent for Debian
ekohl Oct 16, 2023
fc66aaa
Add Fedora 37 & 38 to foss tests
ekohl Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ DESC
task :acceptance do
hosts = {
aio: %w[centos7 centos8 debian10 debian11],
foss: %w[debian10 debian11],
foss: %w[debian10 debian11 debian12 fedora37 fedora38],
}
default_hosts = hosts.map { |type, h| h.map { |host| "#{host}-64{type=#{type}}" }.join('-') }.join('-')
hosts = ENV['BEAKER_HOSTS'] || default_hosts
Expand Down
8 changes: 7 additions & 1 deletion lib/beaker_puppet_helpers/install_utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,16 @@ def self.install_puppet_release_repo_on(host, collection = 'puppet', nightly: fa
# @return [String] The Puppet package name
def self.puppet_package_name(host, prefer_aio: true)
case host['packaging_platform'].split('-', 3).first
when /el|fedora|sles|cisco_|debian|ubuntu/
when 'debian'
# 12 started to ship puppet-agent with puppet as a legacy package
prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 12 ? 'puppet-agent' : 'puppet'
when /el|fedora|sles|cisco_/
prefer_aio ? 'puppet-agent' : 'puppet'
when /freebsd/
'sysutils/puppet'
when 'ubuntu'
# 23.04 started to ship puppet-agent with puppet as a legacy package
prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 2304 ? 'puppet-agent' : 'puppet'
else
'puppet'
end
Expand Down