skip tests that need a pre 6.0 server on el9

voxpupuli · Oct 5, 2023 · aa55e43 · aa55e43
1 parent 319ed84
commit aa55e43
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 0 deletions.
diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
@@ -49,6 +49,8 @@ class { 'postgresql::globals':
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "deploys a zabbix #{zabbix_version} server" do
       # Using puppet_apply as a helper

diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb
@@ -7,6 +7,8 @@
   supported_versions.each do |zabbix_version|
     # Application API was removed in Zabbix 5.4
     next if zabbix_version >= '5.4'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     template = case zabbix_version
                when '5.0'

diff --git a/spec/acceptance/zabbix_host_spec.rb b/spec/acceptance/zabbix_host_spec.rb
@@ -8,6 +8,8 @@
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_host resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can

diff --git a/spec/acceptance/zabbix_hostgroup_spec.rb b/spec/acceptance/zabbix_hostgroup_spec.rb
@@ -7,6 +7,8 @@
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_hostgroup resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can

diff --git a/spec/acceptance/zabbix_proxy_spec.rb b/spec/acceptance/zabbix_proxy_spec.rb
@@ -8,6 +8,8 @@
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_proxy resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can

diff --git a/spec/acceptance/zabbix_template_host_spec.rb b/spec/acceptance/zabbix_template_host_spec.rb
@@ -9,6 +9,8 @@
     next if zabbix_version == '6.0'
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_template_host resources with zabbix version #{zabbix_version}" do
       template = case zabbix_version

diff --git a/spec/acceptance/zabbix_template_spec.rb b/spec/acceptance/zabbix_template_spec.rb
@@ -7,6 +7,8 @@
   supported_versions.each do |zabbix_version|
     # >= 5.2 server packages are not available for RHEL 7
     next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'
+    # < 6.0 server packages are not available for RHEL 9
+    next if zabbix_version < '6.0' && default[:platform] == 'el-9-x86_64'
 
     context "create zabbix_template resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can