Merge 252f57e into cdc17d9

voxpupuli · Jan 27, 2022 · ace09dd · ace09dd
2 parents cdc17d9 + 252f57e
commit ace09dd
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 34 deletions.
diff --git a/lib/beaker/host_prebuilt_steps.rb b/lib/beaker/host_prebuilt_steps.rb
@@ -101,42 +101,56 @@ def timesync host, opts
     def validate_host host, opts
       logger = opts[:logger]
       block_on host do |host|
-        case
-        when host['platform'] =~ /el-[89]/
-          check_and_install_packages_if_needed(host, RHEL8_PACKAGES)
-        when host['platform'] =~ /sles-10/
-          check_and_install_packages_if_needed(host, SLES10_PACKAGES)
-        when host['platform'] =~ /opensuse|sles-/
-          check_and_install_packages_if_needed(host, SLES_PACKAGES)
-        when host['platform'] =~ /debian/
-          check_and_install_packages_if_needed(host, DEBIAN_PACKAGES)
-        when host['platform'] =~ /cumulus/
-          check_and_install_packages_if_needed(host, CUMULUS_PACKAGES)
-        when (host['platform'] =~ /windows/ and host.is_cygwin?)
-          raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
-          check_and_install_packages_if_needed(host, WINDOWS_PACKAGES)
-        when (host['platform'] =~ /windows/ and not host.is_cygwin?)
-          check_and_install_packages_if_needed(host, PSWINDOWS_PACKAGES)
-        when host['platform'] =~ /freebsd/
-          check_and_install_packages_if_needed(host, FREEBSD_PACKAGES)
-        when host['platform'] =~ /openbsd/
-          check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
-        when host['platform'] =~ /solaris-10/
-          check_and_install_packages_if_needed(host, SOLARIS10_PACKAGES)
-        when host['platform'] =~ /solaris-1[1-9]/
-          check_and_install_packages_if_needed(host, SOLARIS11_PACKAGES)
-        when host['platform'] =~ /archlinux/
-          check_and_install_packages_if_needed(host, ARCHLINUX_PACKAGES)
-        when host['platform'] =~ /fedora/
-          check_and_install_packages_if_needed(host, FEDORA_PACKAGES)
-        when host['platform'] !~ /debian|aix|solaris|windows|opensuse-|sles-|osx-|cumulus|f5-|netscaler|cisco_/
-          check_and_install_packages_if_needed(host, UNIX_PACKAGES)
-        end
+        check_and_install_packages_if_needed(host, host_packages(host))
       end
     rescue => e
       report_and_raise(logger, e, "validate")
     end
 
+    # Return a list of packages that should be present.
+    #
+    # @param [Host] host A host return the packages for
+    # @return [Array<String>] A list of packages to install
+    def host_packages(host)
+      case host['platform']
+      when /el-[89]/
+        RHEL8_PACKAGES
+      when /sles-10/
+        SLES10_PACKAGES
+      when /opensuse|sles-/
+        SLES_PACKAGES
+      when /debian/
+        DEBIAN_PACKAGES
+      when /cumulus/
+        CUMULUS_PACKAGES
+      when /windows/
+        if host.is_cygwin?
+          raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
+          WINDOWS_PACKAGES
+        else
+          PSWINDOWS_PACKAGES
+        end
+      when /freebsd/
+        FREEBSD_PACKAGES
+      when /openbsd/
+        OPENBSD_PACKAGES
+      when /solaris-10/
+        SOLARIS10_PACKAGES
+      when /solaris-1[1-9]/
+        SOLARIS11_PACKAGES
+      when /archlinux/
+        ARCHLINUX_PACKAGES
+      when /fedora/
+        FEDORA_PACKAGES
+      else
+        if host['platform'] !~ /aix|solaris|osx-|f5-|netscaler|cisco_/
+          UNIX_PACKAGES
+        else
+          []
+        end
+      end
+    end
+
     # Installs the given packages if they aren't already on a host
     #
     # @param [Host] host Host to act on

diff --git a/spec/beaker/host_prebuilt_steps_spec.rb b/spec/beaker/host_prebuilt_steps_spec.rb
@@ -489,9 +489,9 @@
     end
 
     it 'skips validation on cisco hosts' do
-      @platform = 'cisco_nexus-7-x86_64'
-      expect( subject ).to receive( :check_and_install_packages_if_needed ).never
-      subject.validate_host(hosts, options)
+      host = make_host('cisco-7', { stdout: stdout, platform: 'cisco_nexus-7-x86_64' })
+      expect( subject ).to receive( :check_and_install_packages_if_needed ).with(host, []).once
+      subject.validate_host(host, options)
     end
   end