Merge pull request #1854 from ekohl/simplify-dnf-based-distros

Do not attempt to install curl on DNF-based distros
voxpupuli · Mar 14, 2024 · 9e10133 · 9e10133
2 parents 0b477ea + e21556c
commit 9e10133
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/lib/beaker/host_prebuilt_steps.rb b/lib/beaker/host_prebuilt_steps.rb
@@ -10,10 +10,9 @@ module HostPrebuiltSteps
     NTPSERVER = 'pool.ntp.org'
     SLEEPWAIT = 5
     TRIES = 5
-    AMAZON2023_PACKAGES = %w[curl-minimal chrony]
-    RHEL8_PACKAGES = %w[curl chrony]
-    RHEL9_PACKAGES = ['chrony']
-    FEDORA_PACKAGES = %w[curl chrony]
+    AMAZON2023_PACKAGES = %w[chrony]
+    RHEL8_PACKAGES = %w[chrony]
+    FEDORA_PACKAGES = %w[chrony]
     UNIX_PACKAGES = %w[curl ntpdate]
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
@@ -111,10 +110,8 @@ def host_packages(host)
       case host['platform']
       when /amazon/
         AMAZON2023_PACKAGES
-      when /el-8/
+      when /el-[89]/
         RHEL8_PACKAGES
-      when /el-9/
-        RHEL9_PACKAGES
       when /sles-10/
         SLES10_PACKAGES
       when /opensuse|sles-/