beaker 5.8.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 747514fd1bc4b06447745e41139acb933595b96b683c721abc95239b94e142e3
-  data.tar.gz: bcd6d4cfe1c4b98af67ed652598829d0075b364d0a0dd6035087536f2a77d36d
+  metadata.gz: a57ed9140c38bb9b99f44eccf0f30a892213eb1e7014ded3cbb424bebc3ec26b
+  data.tar.gz: 25e1254d10f91d1deb9d28780cac16871b57ff570bd67978df38666a961592bc
 SHA512:
-  metadata.gz: a9e791460368f7cf86d4bcbfacf0af5ca711d59d2943c0e93070468eb33793bd117dcf788b35eae1fa70a73a5e222522031b42ffc1bf416fc5b69f4efcfbf9e3
-  data.tar.gz: 4daaa7c530f9053600ea808e490a7c930ab77e38d1097db5b6f2310d240198cffea7c7d15c239011157d2b1c2d19a611ab354b8b3e51c333422a5ac326363e9f
+  metadata.gz: a7d2bab439fbe31b20df6417453e66bb5e148489c605946c11f1f3ac2eb637c4bfe4a2d2ac81420866184c1fa491825e1918ae84c56f3b9c446aa0eae76d6d4c
+  data.tar.gz: 41b577a099d6441fe6c95d8fe8a6c6885ca9d8276ae09b1d98e2efa5f8a5c050f2e7e94313e10d3397c42e3fab8c792e93af1d47843812150dd5c6389afdc289

data/.rspec

@@ -1,4 +1,3 @@
 --format documentation
 --color
 --tty
---fail-fast

data/.rubocop.yml

@@ -17,14 +17,11 @@ Naming/FileName:
     - acceptance/**/acceptance-options.rb
 
 Naming/MethodParameterName:
-  Enabled: false
+  MinNameLength: 1
 
 Naming/PredicateName:
   Enabled: false
 
-Naming/VariableNumber:
-  Enabled: false
-
 RSpec/DescribeClass:
   Exclude:
     - acceptance/fixtures/module/spec/**/*.rb
@@ -49,3 +46,6 @@ RSpec/NestedGroups:
 
 Style:
   Enabled: false
+
+Naming/VariableNumber:
+  AllowedPatterns: ['x86_64']

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-03-12 17:49:37 UTC using RuboCop version 1.62.1.
+# on 2024-05-11 14:14:06 UTC using RuboCop version 1.62.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -92,14 +92,13 @@ Minitest/RefuteFalse:
     - 'acceptance/tests/base/dsl/helpers/host_helpers/check_for_package_test.rb'
     - 'acceptance/tests/base/host/host_test.rb'
 
-# Offense count: 20
+# Offense count: 19
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'Rakefile'
     - 'acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb'
-    - 'lib/beaker/host/cisco.rb'
     - 'spec/beaker/host/mac/group_spec.rb'
     - 'spec/beaker/host/mac/user_spec.rb'
     - 'spec/beaker/host/pswindows/user_spec.rb'
@@ -144,7 +143,7 @@ RSpec/BeEq:
     - 'spec/beaker/subcommand/subcommand_util_spec.rb'
     - 'spec/beaker/test_suite_spec.rb'
 
-# Offense count: 121
+# Offense count: 113
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -156,7 +155,7 @@ RSpec/Eq:
   Exclude:
     - 'spec/beaker/logger_spec.rb'
 
-# Offense count: 241
+# Offense count: 231
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 44
@@ -214,13 +213,13 @@ RSpec/MultipleDescribes:
 RSpec/MultipleMemoizedHelpers:
   Max: 18
 
-# Offense count: 502
+# Offense count: 495
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 42
+# Offense count: 41
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
@@ -231,12 +230,6 @@ RSpec/NoExpectationExample:
     - 'spec/beaker/logger_spec.rb'
     - 'spec/beaker/options/subcommand_options_parser_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/Rails/MinitestAssertions:
-  Exclude:
-    - 'spec/beaker/dsl/structure_spec.rb'
-
 # Offense count: 60
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/ReceiveMessages:
@@ -251,11 +244,10 @@ RSpec/ReceiveMessages:
     - 'spec/beaker/test_suite_spec.rb'
     - 'spec/helpers.rb'
 
-# Offense count: 7
+# Offense count: 4
 RSpec/RepeatedDescription:
   Exclude:
     - 'spec/beaker/cli_spec.rb'
-    - 'spec/beaker/host/unix/exec_spec.rb'
     - 'spec/beaker/host/unix/pkg_spec.rb'
 
 # Offense count: 4
@@ -284,7 +276,7 @@ RSpec/SpecFilePathFormat:
     - 'spec/beaker/host/windows/user_spec.rb'
     - 'spec/beaker/host_prebuilt_steps_spec.rb'
 
-# Offense count: 178
+# Offense count: 175
 RSpec/SubjectStub:
   Exclude:
     - 'spec/beaker/dsl/assertions_spec.rb'
@@ -314,6 +306,12 @@ RSpec/UnspecifiedException:
 RSpec/VerifiedDoubles:
   Enabled: false
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpecRails/MinitestAssertions:
+  Exclude:
+    - 'spec/beaker/dsl/structure_spec.rb'
+
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Rake/Desc:
@@ -336,7 +334,7 @@ Security/Open:
   Exclude:
     - 'lib/beaker/dsl/helpers/web_helpers.rb'
 
-# Offense count: 106
+# Offense count: 104
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -1,10 +1,40 @@
 # Changelog
 
+## [6.1.0](https://github.com/voxpupuli/beaker/tree/6.1.0) (2024-06-04)
+
+**Implemented enhancements:**
+
+- Add package logic for Amazon Linux 2 [\#1887](https://github.com/voxpupuli/beaker/pull/1884) ([mhashizume](https://github.com/joshcooper))
+
+## [6.0.0](https://github.com/voxpupuli/beaker/tree/6.0.0) (2024-05-24)
+
+**Breaking changes:**
+
+- Drop EoL F5 support [\#1866](https://github.com/voxpupuli/beaker/pull/1866) ([bastelfreak](https://github.com/bastelfreak))
+- Drop EoL cumulus support [\#1867](https://github.com/voxpupuli/beaker/pull/1867) ([bastelfreak](https://github.com/bastelfreak))
+- drop sys-v leftovers; assume systemctl is available for unknown platforms [\#1868](https://github.com/voxpupuli/beaker/pull/1868) ([bastelfreak](https://github.com/bastelfreak))
+- Drop EoL huaweios support [\#1869](https://github.com/voxpupuli/beaker/pull/1869) ([bastelfreak](https://github.com/bastelfreak))
+- Drop EoL EL4 support [\#1870](https://github.com/voxpupuli/beaker/pull/1870) ([bastelfreak](https://github.com/bastelfreak))
+- Drop support for EoL Debian/Ubuntu versions [\#1871](https://github.com/voxpupuli/beaker/pull/1871) ([bastelfreak](https://github.com/bastelfreak))
+- Drop EoL cisco support [\#1872](https://github.com/voxpupuli/beaker/pull/1872) ([bastelfreak](https://github.com/bastelfreak))
+- Drop Fedora < 22 support [\#1873](https://github.com/voxpupuli/beaker/pull/1873) ([ekohl](https://github.com/ekohl))
+- Drop EoL Arista EOS support [\#1874](https://github.com/voxpupuli/beaker/pull/1874) ([bastelfreak](https://github.com/bastelfreak))
+- drop validate_setup method [\#1875](https://github.com/voxpupuli/beaker/pull/1875) ([bastelfreak](https://github.com/bastelfreak))
+- Drop EoL netscaler support [\#1876](https://github.com/voxpupuli/beaker/pull/1876) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- Add package logic for Amazon Linux 2 [\#1884](https://github.com/voxpupuli/beaker/pull/1884) ([mhashizume](https://github.com/mhashizume))
+
+**Fixed bugs:**
+
+- Add ssh restart for Ubuntu [\#1885](https://github.com/voxpupuli/beaker/pull/1885) ([skyamgarp](https://github.com/skyamgarp))
+
 ## [5.8.1](https://github.com/voxpupuli/beaker/tree/5.8.1) (2024-05-06)
 
 **Fixed bugs:**
 
-- Add extension parameter to parent tmpfile method signature [\#1863](https://github.com/voxpupuli/beaker/pull/1854) ([ekohl](https://github.com/ekohl))
+- Add extension parameter to parent tmpfile method signature [\#1863](https://github.com/voxpupuli/beaker/pull/1863) ([ekohl](https://github.com/ekohl))
 
 ## [5.8.0](https://github.com/voxpupuli/beaker/tree/5.8.0) (2024-03-23)
 

data/Rakefile

@@ -197,15 +197,7 @@ rescue LoadError
 end
 
 begin
-  require 'rubocop/rake_task'
+  require 'voxpupuli/rubocop/rake'
 rescue LoadError
-  # RuboCop is an optional group
-else
-  RuboCop::RakeTask.new(:rubocop) do |task|
-    # These make the rubocop experience maybe slightly less terrible
-    task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
-
-    # Use Rubocop's Github Actions formatter if possible
-    task.formatters << 'github' if ENV['GITHUB_ACTIONS'] == 'true'
-  end
+  # the voxpupuli-rubocop gem is optional
 end

data/acceptance/fixtures/module/spec/acceptance/demo_spec.rb

@@ -22,15 +22,15 @@ describe "my tests" do
   end
 
   it "is able to apply manifests" do
-    manifest_1 = "user {'foo':
+    manifest1 = "user {'foo':
           ensure => present,}"
-    manifest_2 = "user {'foo':
+    manifest2 = "user {'foo':
           ensure => absent,}"
-    manifest_3 = "user {'root':
+    manifest3 = "user {'root':
           ensure => present,}"
-    apply_manifest(manifest_1, :expect_changes => true)
-    apply_manifest(manifest_2, :expect_changes => true)
-    apply_manifest(manifest_3)
+    apply_manifest(manifest1, :expect_changes => true)
+    apply_manifest(manifest2, :expect_changes => true)
+    apply_manifest(manifest3)
   end
 
   describe service('sshd') do

data/acceptance/tests/base/host/packages.rb

@@ -9,8 +9,6 @@ def get_host_pkg(host)
     Beaker::HostPrebuiltSteps::SLES_PACKAGES
   when /debian/
     Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES
-  when /cumulus/
-    Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES
   when /windows/
     host.is_cygwin? ? Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES : Beaker::HostPrebuiltSteps::PSWINDOWS_PACKAGES
   when /freebsd/

data/acceptance/tests/base/host_prebuilt_steps/ssh_environment_test.rb

@@ -1,5 +1,5 @@
 test_name "confirm host prebuilt steps behave correctly" do
-  confine_block :except, :platform => /f5|windows/ do
+  confine_block :except, :platform => /windows/ do
     step "confirm ssh environment file existence" do
       hosts.each do |host|
         assert(host.file_exist?(host[:ssh_env_file]))

data/beaker.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '~> 2.4'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.6.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.7.0'
 
   # Run time dependencies
   s.add_runtime_dependency 'minitar', '~> 0.6'

data/docs/concepts/argument_processing_and_precedence.md

@@ -147,7 +147,7 @@ Usage: beaker [options...]
                                      (default: slow)
         --[no-]ntp                   Sync time on SUTs before testing
                                      (default: false)
-        --repo-proxy                 Proxy packaging repositories on ubuntu, debian, cumulus and solaris-11
+        --repo-proxy                 Proxy packaging repositories on ubuntu, debian and solaris-11
                                      (default: false)
         --package-proxy URL          Set proxy url for package managers (yum and apt)
         --[no-]validate              Validate that SUTs are correctly provisioned before running tests

data/lib/beaker/command.rb

@@ -72,11 +72,7 @@ module Beaker
       append_commands = host.append_commands(cmd, ac, :cmd_exe => @cmdexe)
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
-      cmd_line_array = if host[:platform]&.include?('cisco_ios_xr')
-                         [prepend_commands, env_string, cmd, options_string, args_string, append_commands]
-                       else
-                         [env_string, prepend_commands, cmd, options_string, args_string, append_commands]
-                       end
+      cmd_line_array = [env_string, prepend_commands, cmd, options_string, args_string, append_commands]
       cmd_line_array.compact.reject(&:empty?).join(' ')
     end
 

data/lib/beaker/host/unix/exec.rb

@@ -278,20 +278,18 @@ module Unix::Exec
   # @return [Result] result of restarting the SSH service
   def ssh_service_restart
     case self['platform']
-    when /debian|ubuntu|cumulus|huaweios/
-      exec(Beaker::Command.new("service ssh restart"))
-    when /amazon|(el|centos|redhat|oracle|scientific)-[7-9]|eos-7|fedora-(1[4-9]|2[0-9]|3[0-9])|archlinux-/
-      exec(Beaker::Command.new("systemctl restart sshd.service"))
-    when /el-|centos|fedora|redhat|oracle|scientific|eos/
+    when /debian|ubuntu/
+      exec(Beaker::Command.new("systemctl restart ssh"))
+    when /(el|centos|redhat|oracle|scientific)-[0-6]/
       exec(Beaker::Command.new("/sbin/service sshd restart"))
-    when /opensuse|sles/
-      exec(Beaker::Command.new("/usr/sbin/rcsshd restart"))
     when /solaris/
       exec(Beaker::Command.new("svcadm restart svc:/network/ssh:default"))
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo /etc/rc.d/sshd restart"))
+    when /opensuse|sles/
+      exec(Beaker::Command.new("/usr/sbin/rcsshd restart"))
     else
-      raise ArgumentError, "Unsupported Platform: '#{self['platform']}'"
+      exec(Beaker::Command.new("systemctl restart sshd.service"))
     end
   end
 
@@ -302,11 +300,11 @@ module Unix::Exec
   #   (from {#ssh_service_restart}).
   def ssh_permit_user_environment
     case self['platform']
-    when /amazon|debian|ubuntu|cumulus|huaweios|archlinux|el-|centos|fedora|redhat|oracle|scientific|eos|opensuse|sles|solaris/
+    when /amazon|debian|ubuntu|archlinux|el-|centos|fedora|redhat|oracle|scientific|opensuse|sles|solaris/
       directory = tmpdir
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-      exec(Beaker::Command.new("echo '' >/etc/environment")) if /ubuntu-2(0|2).04/.match?(self['platform'])
+      exec(Beaker::Command.new("echo '' >/etc/environment")) if self['platform'].include?('ubuntu-')
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), { :pty => true })
     else

data/lib/beaker/host/unix/file.rb

@@ -92,7 +92,7 @@ module Unix::File
       '/etc/yum.repos.d/'
     when /opensuse|sles/
       '/etc/zypp/repos.d/'
-    when /debian|ubuntu|cumulus|huaweios/
+    when /debian|ubuntu/
       '/etc/apt/sources.list.d'
     else
       msg = "package config dir unknown for platform '#{self['platform']}'"
@@ -113,26 +113,17 @@ module Unix::File
     repo_filename = format("pl-%s-%s-", package_name, build_version)
 
     case variant
-    when /amazon|fedora|el|redhat|centos|cisco_nexus|cisco_ios_xr|opensuse|sles/
+    when /amazon|fedora|el|redhat|centos|opensuse|sles/
       variant = 'el' if %w[centos redhat].include?(variant)
 
       variant = 'redhatfips' if self['packaging_platform']&.include?('redhatfips')
 
-      if variant == 'cisco_nexus'
-        variant = 'cisco-wrlinux'
-        version = '5'
-      end
-      if variant == 'cisco_ios_xr'
-        variant = 'cisco-wrlinux'
-        version = '7'
-      end
       fedora_prefix = (variant == 'fedora' ? 'f' : '')
 
       pattern = "%s-%s%s-%s.repo"
 
       repo_filename << (format(pattern, variant, fedora_prefix, version, arch))
-    when /debian|ubuntu|cumulus|huaweios/
-      codename = variant if variant == 'cumulus' || variant == 'huaweios'
+    when /debian|ubuntu/
       repo_filename << (format("%s.list", codename))
     else
       msg = "#repo_filename: repo filename pattern not known for platform '#{self['platform']}'"
@@ -151,7 +142,7 @@ module Unix::File
     case self['platform']
     when /amazon|fedora|el-|redhat|centos|opensuse|sles/
       'rpm'
-    when /debian|ubuntu|cumulus|huaweios/
+    when /debian|ubuntu/
       'deb'
     else
       msg = "#repo_type: repo type not known for platform '#{self['platform']}'"

data/lib/beaker/host/unix/pkg.rb

@@ -37,12 +37,9 @@ module Unix::Pkg
         self[:sles_rpmkeys_nightly_pl_imported] = true
       end
       result = execute("zypper --gpg-auto-import-keys se -i --match-exact #{name}", opts) { |result| result }
-    when /el-4/
-      @logger.debug("Package query not supported on rhel4")
-      return false
-    when /amazon|cisco|fedora|centos|redhat|eos|el-/
+    when /amazon|fedora|centos|redhat|el-/
       result = execute("rpm -q #{name}", opts) { |result| result }
-    when /ubuntu|debian|cumulus|huaweios/
+    when /ubuntu|debian/
       result = execute("dpkg -s #{name}", opts) { |result| result }
     when /solaris-11/
       result = execute("pkg info #{name}", opts) { |result| result }
@@ -62,7 +59,7 @@ module Unix::Pkg
   # If apt has not been updated since the last repo deployment it is
   # updated. Otherwise this is a noop
   def update_apt_if_needed
-    return unless /debian|ubuntu|cumulus|huaweios/.match?(self['platform'])
+    return unless /debian|ubuntu/.match?(self['platform'])
     return unless @apt_needs_update
 
     execute("apt-get update")
@@ -85,15 +82,13 @@ module Unix::Pkg
     case self['platform']
     when /opensuse|sles-/
       execute("zypper --non-interactive --gpg-auto-import-keys in #{name}", opts)
-    when /el-4/
-      @logger.debug("Package installation not supported on rhel4")
     when /amazon-2023|el-(8|9|1[0-9])|fedora/
       name = "#{name}-#{version}" if version
       execute("dnf -y #{cmdline_args} install #{name}", opts)
-    when /cisco|centos|redhat|eos|el-[1-7]-/
+    when /amazon-(2|7)|centos|redhat|el-[1-7]-/
       name = "#{name}-#{version}" if version
       execute("yum -y #{cmdline_args} install #{name}", opts)
-    when /ubuntu|debian|cumulus|huaweios/
+    when /ubuntu|debian/
       name = "#{name}=#{version}" if version
       update_apt_if_needed
       execute("apt-get install --force-yes #{cmdline_args} -y #{name}", opts)
@@ -170,13 +165,11 @@ module Unix::Pkg
     case self['platform']
     when /opensuse|sles-/
       execute("zypper --non-interactive rm #{name}", opts)
-    when /el-4/
-      @logger.debug("Package uninstallation not supported on rhel4")
     when /amazon-2023|el-(8|9|1[0-9])|fedora/
       execute("dnf -y #{cmdline_args} remove #{name}", opts)
-    when /cisco|centos|redhat|eos|el-[1-7]-/
+    when /amazon-(2|7)|centos|redhat|el-[1-7]-/
       execute("yum -y #{cmdline_args} remove #{name}", opts)
-    when /ubuntu|debian|cumulus|huaweios/
+    when /ubuntu|debian/
       execute("apt-get purge #{cmdline_args} -y #{name}", opts)
     when /solaris-11/
       execute("pkg #{cmdline_args} uninstall #{name}", opts)
@@ -200,13 +193,11 @@ module Unix::Pkg
     case self['platform']
     when /opensuse|sles-/
       execute("zypper --non-interactive --no-gpg-checks up #{name}", opts)
-    when /el-4/
-      @logger.debug("Package upgrade is not supported on rhel4")
-    when /fedora-(2[2-9]|3[0-9])/
+    when /fedora/
       execute("dnf -y #{cmdline_args} update #{name}", opts)
-    when /cisco|fedora|centos|redhat|eos|el-/
+    when /centos|redhat|el-/
       execute("yum -y #{cmdline_args} update #{name}", opts)
-    when /ubuntu|debian|cumulus|huaweios/
+    when /ubuntu|debian/
       update_apt_if_needed
       execute("apt-get install -o Dpkg::Options::='--force-confold' #{cmdline_args} -y --force-yes #{name}", opts)
     when /solaris-11/
@@ -270,7 +261,7 @@ module Unix::Pkg
       execute("#{command_name} --nogpgcheck localinstall -y #{onhost_package_file}")
     when /^(opensuse|sles)$/
       execute("zypper --non-interactive --no-gpg-checks in #{onhost_package_file}")
-    when /^(debian|ubuntu|cumulus)$/
+    when /^(debian|ubuntu)$/
       execute("dpkg -i --force-all #{onhost_package_file}")
       execute("apt-get update")
     when /^solaris$/
@@ -294,7 +285,7 @@ module Unix::Pkg
   def uncompress_local_tarball(onhost_tar_file, onhost_base_dir, download_file)
     variant, version, _arch, _codename = self['platform'].to_array
     case variant
-    when /^(amazon|fedora|el|centos|redhat|opensuse|sles|debian|ubuntu|cumulus)$/
+    when /^(amazon|fedora|el|centos|redhat|opensuse|sles|debian|ubuntu)$/
       execute("tar -zxvf #{onhost_tar_file} -C #{onhost_base_dir}")
     when /^solaris$/
       # uncompress PE puppet-agent tarball

data/lib/beaker/host/unix.rb

@@ -51,18 +51,6 @@ module Unix
     # @return [String,nil] Reason message if set_env should be skipped,
     #   nil if it should run.
     def skip_set_env?
-      case self['platform'].variant
-      when /^(f5|netscaler)$/
-        "no puppet-agent package for network device platform '#{self['platform'].variant}'"
-      end
-    end
-
-    # Validates that the host was setup correctly
-    #
-    # @return nil
-    # @raise [ArgumentError] If the host is setup incorrectly,
-    #   this will be raised with the appropriate message
-    def validate_setup
       nil
     end
 

data/lib/beaker/host.rb

@@ -57,10 +57,6 @@ module Beaker
         Mac::Host.new name, host_hash, options
       when /freebsd/
         FreeBSD::Host.new name, host_hash, options
-      when /eos/
-        Eos::Host.new name, host_hash, options
-      when /cisco/
-        Cisco::Host.new name, host_hash, options
       else
         Unix::Host.new name, host_hash, options
       end
@@ -576,8 +572,6 @@ module Beaker
     freebsd
     windows
     pswindows
-    eos
-    cisco
   ].each do |lib|
     require "beaker/host/#{lib}"
   end

data/lib/beaker/host_prebuilt_steps.rb

@@ -22,7 +22,6 @@ module Beaker
     SLES10_PACKAGES = ['curl']
     SLES_PACKAGES = %w[curl ntp]
     DEBIAN_PACKAGES = %w[curl ntpdate lsb-release apt-transport-https]
-    CUMULUS_PACKAGES = %w[curl ntpdate]
     SOLARIS10_PACKAGES = %w[CSWcurl CSWntp wget]
     SOLARIS11_PACKAGES = %w[curl ntp]
     ETC_HOSTS_PATH = "/etc/hosts"
@@ -53,9 +52,6 @@ module Beaker
             ntp_command = "chronyc add server #{ntp_server} prefer trust;chronyc makestep;chronyc burst 1/2"
           elsif /opensuse-|sles-/.match?(host['platform'])
             ntp_command = "sntp #{ntp_server}"
-          elsif host['platform'].include?('cisco_nexus')
-            ntp_server = host.exec(Command.new("getent hosts #{NTPSERVER} | head -n1 |cut -d \" \" -f1"), :acceptable_exit_codes => [0]).stdout
-            ntp_command = "sudo -E sh -c 'export DCOS_CONTEXT=2;/isan/bin/ntpdate -u -t 20 #{ntp_server}'"
           else
             ntp_command = "ntpdate -u -t 20 #{ntp_server}"
           end
@@ -86,7 +82,6 @@ module Beaker
     # Verifies the presence of #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts,
     # {HostPrebuiltSteps::SLES_PACKAGES} on SUSE platform hosts,
     # {HostPrebuiltSteps::DEBIAN_PACKAGES} on debian platform hosts,
-    # {HostPrebuiltSteps::CUMULUS_PACKAGES} on cumulus platform hosts,
     # {HostPrebuiltSteps::WINDOWS_PACKAGES} on cygwin-installed windows platform hosts,
     # and {HostPrebuiltSteps::PSWINDOWS_PACKAGES} on non-cygwin windows platform hosts.
     #
@@ -118,8 +113,6 @@ module Beaker
         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?
@@ -141,7 +134,7 @@ module Beaker
       when /fedora/
         FEDORA_PACKAGES
       else
-        if !/aix|solaris|osx-|f5-|netscaler|cisco_/.match?(host['platform'])
+        if !/aix|solaris|osx-/.match?(host['platform'])
           UNIX_PACKAGES
         else
           []
@@ -193,7 +186,7 @@ module Beaker
       block_on host do |host|
         logger.notify "Sync root authorized_keys from github on #{host.name}"
         # Allow all exit code, as this operation is unlikely to cause problems if it fails.
-        if /solaris|eos/.match?(host['platform'])
+        if host['platform'].include?('solaris')
           host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "bash"), :accept_all_exit_codes => true)
         elsif host['platform'].include?('aix')
           host.exec(Command.new(ROOT_KEYS_SYNC_CMD_AIX % "env PATH=/usr/gnu/bin:$PATH bash"), :accept_all_exit_codes => true)
@@ -206,12 +199,12 @@ module Beaker
     end
 
     # Run 'apt-get update' on the provided host or hosts.
-    # If the platform of the provided host is not ubuntu, debian or cumulus: do nothing.
+    # If the platform of the provided host is not ubuntu or debian: do nothing.
     #
     # @param [Host, Array<Host>] hosts One or more hosts to act upon
     def apt_get_update hosts
       block_on hosts do |host|
-        host.exec(Command.new("apt-get update")) if /ubuntu|debian|cumulus/.match?(host[:platform])
+        host.exec(Command.new("apt-get update")) if /ubuntu|debian/.match?(host[:platform])
       end
     end
 
@@ -342,14 +335,12 @@ module Beaker
     def disable_updates hosts, opts
       logger = opts[:logger]
       hosts.each do |host|
-        next if host['platform'].include?('netscaler')
-
         logger.notify "Disabling updates.puppetlabs.com by modifying hosts file to resolve updates to 127.0.0.1 on #{host}"
         set_etc_hosts(host, "127.0.0.1\tupdates.puppetlabs.com\n")
       end
     end
 
-    # Update sshd_config on debian, ubuntu, centos, el, redhat, cumulus, and fedora boxes to allow for root login
+    # Update sshd_config on debian, ubuntu, centos, el, redhat and fedora boxes to allow for root login
     #
     # Does nothing on other platfoms.
     #
@@ -376,8 +367,7 @@ module Beaker
         elsif host['platform'].include?('solaris-11')
           host.exec(Command.new("if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"), { :pty => true })
           host.exec(Command.new("sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), { :pty => true })
-        elsif host['platform'].include?('f5') || host.is_powershell?
-          # interacting with f5 should using tmsh
+        elsif host.is_powershell?
           logger.warn("Attempting to enable root login non-supported platform: #{host.name}: #{host['platform']}")
         elsif host.is_cygwin?
           host.exec(Command.new("sed -ri 's/^#?PermitRootLogin /PermitRootLogin yes/' /etc/sshd_config"), { :pty => true })
@@ -385,11 +375,11 @@ module Beaker
           host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), { :pty => true })
         end
         # restart sshd
-        if /debian|ubuntu|cumulus/.match?(host['platform'])
+        if /debian|ubuntu/.match?(host['platform'])
           host.exec(Command.new("sudo su -c \"service ssh restart\""), { :pty => true })
-        elsif /amazon|arch|(centos|el|redhat)-[789]|fedora-(1[4-9]|2[0-9]|3[0-9])/.match?(host['platform'])
+        elsif /amazon|arch|(centos|el|redhat)-[789]|fedora/.match?(host['platform'])
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), { :pty => true })
-        elsif /centos|el-|redhat|fedora|eos/.match?(host['platform'])
+        elsif /centos|el-|redhat/.match?(host['platform'])
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), { :pty => true })
         elsif /(free|open)bsd/.match?(host['platform'])
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
@@ -408,7 +398,7 @@ module Beaker
     def disable_se_linux host, opts
       logger = opts[:logger]
       block_on host do |host|
-        if /centos|el-|redhat|fedora|eos/.match?(host['platform'])
+        if /centos|el-|redhat|fedora/.match?(host['platform'])
           logger.debug("Disabling se_linux on #{host.name}")
           host.exec(Command.new("sudo su -c \"setenforce 0\""), { :pty => true })
         else
@@ -418,7 +408,7 @@ module Beaker
     end
 
     # Setup files for enabling requests to pass to a proxy server
-    # This works for the APT package manager on debian, ubuntu, and cumulus
+    # This works for the APT package manager on debian and ubuntu
     # and YUM package manager on el, centos, fedora and redhat.
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
@@ -429,9 +419,9 @@ module Beaker
       block_on host do |host|
         logger.debug("enabling proxy support on #{host.name}")
         case host['platform']
-        when /ubuntu/, /debian/, /cumulus/
+        when /ubuntu/, /debian/
           host.exec(Command.new("echo 'Acquire::http::Proxy \"#{opts[:package_proxy]}/\";' >> /etc/apt/apt.conf.d/10proxy"))
-        when /amazon/, /^el-/, /centos/, /fedora/, /redhat/, /eos/
+        when /amazon/, /^el-/, /centos/, /fedora/, /redhat/
           host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
         when /solaris-11/
           host.exec(Command.new("/usr/bin/pkg unset-publisher solaris || :"))