Skip to content

Commit

Permalink
platform: don't install curl-minimal on EL family
Browse files Browse the repository at this point in the history
curl-minimal was mistakenly added in commit 18e6e22.

Attempting to install it on EL 8 and newer causes errors because there
is no such package.

curl is installed by default. See
https://fedoraproject.org/wiki/Changes/CurlMinimal_as_Default and #1854,
for example.
  • Loading branch information
kenyon committed Aug 27, 2024
1 parent 53e8f88 commit 6681cf5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/beaker/platform.rb
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
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

0 comments on commit 6681cf5

Please sign in to comment.