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

platform: don't install curl-minimal on EL family #1902

Merged
merged 1 commit into from
Aug 27, 2024
Merged

platform: don't install curl-minimal on EL family #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/beaker/platform.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def uses_chrony?
def base_packages
case @variant
when 'el'
@version.to_i >= 8 ? ['curl-minimal', 'iputils'] : %w[curl]
@version.to_i >= 8 ? ['iputils'] : %w[curl]
when 'debian'
%w[curl lsb-release]
when 'freebsd'
Expand All @@ -128,7 +128,7 @@ def base_packages
when 'archlinux'
%w[curl net-tools openssh]
when 'amazon', 'fedora'
['curl-minimal', 'iputils']
['iputils']
when 'aix', 'osx', 'windows'
[]
else
Expand Down
8 changes: 4 additions & 4 deletions spec/beaker/host_prebuilt_steps_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
it "can validate el-9 hosts" do
host = make_host('host', { :platform => 'el-9-64' })

['curl-minimal', 'iputils'].each do |pkg|
['iputils'].each do |pkg|
expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
expect(host).to receive(:install_package).with(pkg).once
end
Expand Down Expand Up @@ -321,7 +321,7 @@
it "can validate RHEL8 hosts" do
host = make_host('host', { :platform => 'el-8-64' })

['curl-minimal', 'iputils'].each do |pkg|
['iputils'].each do |pkg|
expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
expect(host).to receive(:install_package).with(pkg).once
end
Expand All @@ -332,7 +332,7 @@
it "can validate Fedora hosts" do
host = make_host('host', { :platform => 'fedora-32-x86_64' })

['curl-minimal', 'iputils'].each do |pkg|
['iputils'].each do |pkg|
expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
expect(host).to receive(:install_package).with(pkg).once
end
Expand All @@ -343,7 +343,7 @@
it "can validate Amazon hosts" do
host = make_host('host', { :platform => 'amazon-2023-x86_64' })

['curl-minimal', 'iputils'].each do |pkg|
['iputils'].each do |pkg|
expect(host).to receive(:check_for_package).with(pkg).once.and_return(false)
expect(host).to receive(:install_package).with(pkg).once
end
Expand Down