Skip to content

Commit a59f433

Browse files
authored
Merge pull request #837 from bastelfreak/debian
Drop EoL Debian 9 support
2 parents 7f7a682 + 7f9fe1b commit a59f433

File tree

8 files changed

+6
-8
lines changed

8 files changed

+6
-8
lines changed

metadata.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
{
115115
"operatingsystem": "Debian",
116116
"operatingsystemrelease": [
117-
"9",
118117
"10",
119118
"11"
120119
]

spec/acceptance/zabbix_application_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_application type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
6+
describe 'zabbix_application type', unless: default[:platform] =~ %r{archlinux} do
77
supported_versions.each do |zabbix_version|
88
# 5.2 and 5.4 server packages are not available for RHEL 7
99
next if zabbix_version == '5.2' && default[:platform] == 'el-7-x86_64'

spec/acceptance/zabbix_host_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'serverspec_type_zabbixapi'
55

66
# rubocop:disable RSpec/LetBeforeExamples
7-
describe 'zabbix_host type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
7+
describe 'zabbix_host type', unless: default[:platform] =~ %r{archlinux} do
88
supported_versions.each do |zabbix_version|
99
# >= 5.2 server packages are not available for RHEL 7
1010
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

spec/acceptance/zabbix_hostgroup_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_hostgroup type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
6+
describe 'zabbix_hostgroup type', unless: default[:platform] =~ %r{archlinux} do
77
supported_versions.each do |zabbix_version|
88
# >= 5.2 server packages are not available for RHEL 7
99
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

spec/acceptance/zabbix_proxy_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'serverspec_type_zabbixapi'
55

66
# rubocop:disable RSpec/LetBeforeExamples
7-
describe 'zabbix_proxy type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
7+
describe 'zabbix_proxy type', unless: default[:platform] =~ %r{archlinux} do
88
supported_versions.each do |zabbix_version|
99
# >= 5.2 server packages are not available for RHEL 7
1010
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

spec/acceptance/zabbix_template_host_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_template_host type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
6+
describe 'zabbix_template_host type', unless: default[:platform] =~ %r{archlinux} do
77
supported_versions.each do |zabbix_version|
88
# Zabbix 6.0 removed the ability to attach templates directly to hosts.
99
next if zabbix_version == '6.0'

spec/acceptance/zabbix_template_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_template type', unless: default[:platform] =~ %r{(debian-9|archlinux)} do
6+
describe 'zabbix_template type', unless: default[:platform] =~ %r{archlinux} do
77
supported_versions.each do |zabbix_version|
88
# >= 5.2 server packages are not available for RHEL 7
99
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

spec/classes/web_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
next if facts[:os]['name'] == 'windows'
2020
next if facts[:os]['name'] == 'Archlinux'
2121
next if facts[:os]['name'] == 'Gentoo'
22-
next if facts[:os]['name'] == 'Debian' && facts[:os]['release']['major'] == '9'
2322
# There are no zabbix 5.2 packages for Debian 11
2423
next if facts[:os]['name'] == 'Debian' && facts[:os]['release']['major'] == '11' && zabbix_version == '5.2'
2524

0 commit comments

Comments
 (0)