Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop EoL netscaler support #1876

Merged
merged 1 commit into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions lib/beaker/host/unix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

def initialize name, host_hash, options
Expand Down
4 changes: 1 addition & 3 deletions lib/beaker/host_prebuilt_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
[]
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions lib/beaker/platform.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)
Expand Down