From 6681cf5f9d6900bf695db63e20597f4a25122dce Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <quic_kralph@quicinc.com>
Date: Tue, 27 Aug 2024 12:13:07 -0700
Subject: [PATCH] platform: don't install curl-minimal on EL family

curl-minimal was mistakenly added in commit 18e6e2292aeed5557c6a85e45ba86365ca43d6f6.

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.
---
 lib/beaker/platform.rb                  | 4 ++--
 spec/beaker/host_prebuilt_steps_spec.rb | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/beaker/platform.rb b/lib/beaker/platform.rb
index 901336b10..84618bbf3 100644
--- a/lib/beaker/platform.rb
+++ b/lib/beaker/platform.rb
@@ -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'
@@ -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
diff --git a/spec/beaker/host_prebuilt_steps_spec.rb b/spec/beaker/host_prebuilt_steps_spec.rb
index 82144c1d6..e5d17d054 100644
--- a/spec/beaker/host_prebuilt_steps_spec.rb
+++ b/spec/beaker/host_prebuilt_steps_spec.rb
@@ -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
@@ -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
@@ -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
@@ -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