diff --git a/lib/beaker/host/unix.rb b/lib/beaker/host/unix.rb index ca88425f5..b1236c008 100644 --- a/lib/beaker/host/unix.rb +++ b/lib/beaker/host/unix.rb @@ -51,10 +51,7 @@ def external_copy_base # @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 'netscaler' - "no puppet-agent package for network device platform '#{self['platform'].variant}'" - end + nil end # Validates that the host was setup correctly diff --git a/lib/beaker/host_prebuilt_steps.rb b/lib/beaker/host_prebuilt_steps.rb index b01394725..60b55a02a 100644 --- a/lib/beaker/host_prebuilt_steps.rb +++ b/lib/beaker/host_prebuilt_steps.rb @@ -134,7 +134,7 @@ def host_packages(host) when /fedora/ FEDORA_PACKAGES else - if !/aix|solaris|osx-|netscaler/.match?(host['platform']) + if !/aix|solaris|osx-/.match?(host['platform']) UNIX_PACKAGES else [] @@ -335,8 +335,6 @@ def hack_etc_hosts hosts, _opts 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 diff --git a/lib/beaker/platform.rb b/lib/beaker/platform.rb index d7b005600..caeaa4174 100644 --- a/lib/beaker/platform.rb +++ b/lib/beaker/platform.rb @@ -3,7 +3,7 @@ module Beaker # all String methods while adding several platform-specific use cases. class Platform < String # Supported platforms - PLATFORMS = /^(alpine|amazon|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el|netscaler)\-.+\-.+$/ + PLATFORMS = /^(alpine|amazon|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el)\-.+\-.+$/ # Platform version numbers vs. codenames conversion hash PLATFORM_VERSION_CODES = { :debian => { "forky" => "14", @@ -75,7 +75,6 @@ class Platform < String # * solaris # * aix # * el - # * netscaler # * archlinux def initialize(name) raise ArgumentError, "Unsupported platform name #{name}" if !PLATFORMS.match?(name)