Skip to content

Commit aa55e43

Browse files
committed
skip tests that need a pre 6.0 server on el9
1 parent 319ed84 commit aa55e43

File tree

7 files changed

+14
-0
lines changed

7 files changed

+14
-0
lines changed

spec/acceptance/server_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ class { 'postgresql::globals':
4949
supported_versions.each do |zabbix_version|
5050
# >= 5.2 server packages are not available for RHEL 7
5151
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
52+
# < 6.0 server packages are not available for RHEL 9
53+
next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
5254

5355
context "deploys a zabbix #{zabbix_version} server" do
5456
# Using puppet_apply as a helper

spec/acceptance/zabbix_application_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
supported_versions.each do |zabbix_version|
88
# Application API was removed in Zabbix 5.4
99
next if zabbix_version >= '5.4'
10+
# < 6.0 server packages are not available for RHEL 9
11+
next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
1012

1113
template = case zabbix_version
1214
when '5.0'

spec/acceptance/zabbix_host_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
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'
11+
# < 6.0 server packages are not available for RHEL 9
12+
next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
1113

1214
context "create zabbix_host resources with zabbix version #{zabbix_version}" do
1315
# This will deploy a running Zabbix setup (server, web, db) which we can

spec/acceptance/zabbix_hostgroup_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
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'
10+
# < 6.0 server packages are not available for RHEL 9
11+
next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
1012

1113
context "create zabbix_hostgroup resources with zabbix version #{zabbix_version}" do
1214
# This will deploy a running Zabbix setup (server, web, db) which we can

spec/acceptance/zabbix_proxy_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
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'
11+
# < 6.0 server packages are not available for RHEL 9
12+
next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
1113

1214
context "create zabbix_proxy resources with zabbix version #{zabbix_version}" do
1315
# This will deploy a running Zabbix setup (server, web, db) which we can

spec/acceptance/zabbix_template_host_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
next if zabbix_version == '6.0'
1010
# >= 5.2 server packages are not available for RHEL 7
1111
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
12+
# < 6.0 server packages are not available for RHEL 9
13+
next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
1214

1315
context "create zabbix_template_host resources with zabbix version #{zabbix_version}" do
1416
template = case zabbix_version

spec/acceptance/zabbix_template_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
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'
10+
# < 6.0 server packages are not available for RHEL 9
11+
next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
1012

1113
context "create zabbix_template resources with zabbix version #{zabbix_version}" do
1214
# This will deploy a running Zabbix setup (server, web, db) which we can

0 commit comments

Comments
 (0)