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

Jump to bottom

Fix install_puppet_on on el8 #170

Merged
merged 2 commits into from
Aug 31, 2021
Merged

Fix install_puppet_on on el8 #170

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27879b
Add el8 support for install_puppet_on
gcampbell12 Aug 31, 2021
bce5987
Merge install with fedora platform detection
gcampbell12 Aug 31, 2021
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
10 changes: 4 additions & 6 deletions lib/beaker-puppet/install_utils/foss_utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,10 @@ def install_puppet_on(hosts, opts = options)
# run_in_parallel option includes install
run_in_parallel = run_in_parallel? opts, @options, 'install'
block_on hosts, { :run_in_parallel => run_in_parallel } do |host|
if host['platform'] =~ /el-(5|6|7)/
relver = $1
install_puppet_from_rpm_on(host, opts.merge(:release => relver, :family => 'el'))
elsif host['platform'] =~ /fedora-(\d+)/
relver = $1
install_puppet_from_rpm_on(host, opts.merge(:release => relver, :family => 'fedora'))
if host['platform'] =~ /(el|fedora)-(\d+)/
family = $1
relver = $2
install_puppet_from_rpm_on(host, opts.merge(:release => relver, :family => family))
elsif host['platform'] =~ /(ubuntu|debian|cumulus|huaweios)/
install_puppet_from_deb_on(host, opts)
elsif host['platform'] =~ /windows/
Expand Down