only install timesync related packages if enabled

lib/beaker/host_prebuilt_steps.rb

@@ -31,6 +31,7 @@
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
     ROOT_KEYS_SYNC_CMD = "curl -k -o - -L #{ROOT_KEYS_SCRIPT} | %s"
     ROOT_KEYS_SYNC_CMD_AIX = "curl --tlsv1 -o - -L #{ROOT_KEYS_SCRIPT} | %s"
+    TIMESYNC_PACKAGES = ['CSWntp', 'ntp', 'ntpdate', 'chrony']
 
     # Run timesync on the provided hosts
     # @param [Host, Array<Host>] host One or more hosts to act upon
@@ -108,48 +109,50 @@
     # @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 /amazon/
-        AMAZON2023_PACKAGES
-      when /el-8/
-        RHEL8_PACKAGES
-      when /el-9/
-        RHEL9_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 !/aix|solaris|osx-|f5-|netscaler|cisco_/.match?(host['platform'])
-          UNIX_PACKAGES
-        else
-          []
-        end
-      end
+      packages = case host['platform']
+                 when /amazon/
+                   AMAZON2023_PACKAGES
+                 when /el-8/
+                   RHEL8_PACKAGES
+                 when /el-9/
+                   RHEL9_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 !/aix|solaris|osx-|f5-|netscaler|cisco_/.match?(host['platform'])
+                     UNIX_PACKAGES
+                   else
+                     []
+                   end
+                 end
+      packages.select! { |pkg| !TIMESYNC_PACKAGES.include?(pkg) } unless host['timesync']
+      packages
     end
 
     # Installs the given packages if they aren't already on a host

spec/beaker/host_prebuilt_steps_spec.rb

@@ -12,11 +12,13 @@
   let(:rhel8_packages) { Beaker::HostPrebuiltSteps::RHEL8_PACKAGES }
   let(:fedora_packages) { Beaker::HostPrebuiltSteps::FEDORA_PACKAGES }
   let(:amazon2023_packages) { Beaker::HostPrebuiltSteps::AMAZON2023_PACKAGES }
+  let(:timesync_packages) { Beaker::HostPrebuiltSteps::TIMESYNC_PACKAGES }
   let(:platform)       { @platform || 'unix' }
+  let(:timesync)       { @timesync || false }
   let(:ip)             { "ip.address.0.0" }
   let(:stdout) { @stdout || ip }
   let(:hosts) do
-    hosts = make_hosts({ :stdout => stdout, :platform => platform })
+    hosts = make_hosts({ :stdout => stdout, :platform => platform, :timesync => timesync })
     hosts[0][:roles] = ['agent']
     hosts[1][:roles] = %w[master dashboard agent database]
     hosts[2][:roles] = ['agent']
@@ -293,7 +295,8 @@
   end
 
   context "validate_host" do
     subject { dummy_class.new }
+    let(:timesync) { true }
 
     it "can validate unix hosts" do
       hosts.each do |host|
@@ -393,6 +396,16 @@
     end
   end
 
+  context 'host_packages' do
+    subject { dummy_class.new }
+
+    it "filters timesync packages" do
+      hosts.each do |host|
+        expect(subject.host_packages(host)).not_to include(*timesync_packages)
+      end
+    end
+  end
+
   context 'get_domain_name' do
     subject { dummy_class.new }
 
@@ -402,7 +415,7 @@
       end
     end
 
     context "on windows" do
       let(:host) do
         make_host('name', {
                     :platform => 'windows',
@@ -411,7 +424,7 @@
                   })
       end
 
       context "with cygwin" do
         let(:cygwin) { true }
 
         before do
@@ -421,7 +434,7 @@
         include_examples 'find domain name'
       end
 
       context "without cygwin" do
         let(:cygwin) { false }
 
         before do
@@ -433,7 +446,7 @@
     end
 
     %w[amazon centos redhat].each do |platform|
       context "on platform '#{platform}'" do
         let(:host) do
           make_host('name', {
                       :platform => platform,
@@ -445,25 +458,25 @@
           expect(Beaker::Command).to receive(:new).with("cat /etc/resolv.conf").once
         end
 
         context "with a domain entry" do
           let(:stdout) { "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
           include_examples 'find domain name'
         end
 
         context "with a search entry" do
           let(:stdout) { "search labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
           include_examples 'find domain name'
         end
 
         context "with a both a domain and a search entry" do
           let(:stdout) { "domain labs.lan\nsearch d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
           include_examples 'find domain name'
         end
 
         context "with a both a domain and a search entry, the search entry first" do
           let(:stdout) { "search foo.example.net\ndomain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
           include_examples 'find domain name'