From 46d571c74190df96f6906848e45e9386007cc954 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 4 Oct 2023 14:09:41 +0200 Subject: [PATCH] skip tests that need a pre 6.0 server on el9 --- spec/acceptance/zabbix_application_spec.rb | 2 ++ spec/acceptance/zabbix_host_spec.rb | 2 ++ spec/acceptance/zabbix_hostgroup_spec.rb | 2 ++ spec/acceptance/zabbix_proxy_spec.rb | 2 ++ spec/acceptance/zabbix_template_host_spec.rb | 2 ++ spec/acceptance/zabbix_template_spec.rb | 2 ++ 6 files changed, 12 insertions(+) diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb index e936cecc2..065aa02ed 100644 --- 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 index 4e2980cc5..993fafd71 100644 --- 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 index 27dad8344..32c4a3845 100644 --- 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 index 6e1f78e34..d92d709b7 100644 --- 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 index cce2d6a33..cd7db3fa2 100644 --- 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 index 45689b632..fe025c7a6 100644 --- 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