From b4337d154a3228d363b945b1343d92d72cc1948b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 4 Oct 2023 13:08:12 +0200 Subject: [PATCH 1/3] add EL9 support --- metadata.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/metadata.json b/metadata.json index 71b489d0b..7b5fc15f1 100644 --- a/metadata.json +++ b/metadata.json @@ -60,7 +60,8 @@ "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { @@ -74,7 +75,8 @@ "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { @@ -88,7 +90,8 @@ "operatingsystem": "CentOS", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { From 319ed8410b8609f94738e87e6d76f0c0c4da7bb3 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 4 Oct 2023 13:51:26 +0200 Subject: [PATCH 2/3] only load mod::php on non EL systems on EL we default to FPM anyway --- spec/acceptance/zabbix_application_spec.rb | 4 +++- spec/acceptance/zabbix_host_spec.rb | 4 +++- spec/acceptance/zabbix_hostgroup_spec.rb | 4 +++- spec/acceptance/zabbix_proxy_spec.rb | 4 +++- spec/acceptance/zabbix_template_host_spec.rb | 4 +++- spec/acceptance/zabbix_template_spec.rb | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb index 12618b1dd..e936cecc2 100644 --- a/spec/acceptance/zabbix_application_spec.rb +++ b/spec/acceptance/zabbix_application_spec.rb @@ -22,7 +22,9 @@ class { 'apache': mpm_module => 'prefork', } - include apache::mod::php + if $facts['os']['family'] != 'RedHat' { + include apache::mod::php + } class { 'postgresql::globals': locale => 'en_US.UTF-8', manage_package_repo => $facts['os']['release']['major'] != '8', diff --git a/spec/acceptance/zabbix_host_spec.rb b/spec/acceptance/zabbix_host_spec.rb index 4795ec8c3..4e2980cc5 100644 --- a/spec/acceptance/zabbix_host_spec.rb +++ b/spec/acceptance/zabbix_host_spec.rb @@ -31,7 +31,9 @@ class { 'apache': mpm_module => 'prefork', } - include apache::mod::php + if $facts['os']['family'] != 'RedHat' { + include apache::mod::php + } class { 'postgresql::globals': locale => 'en_US.UTF-8', manage_package_repo => $facts['os']['release']['major'] != '8', diff --git a/spec/acceptance/zabbix_hostgroup_spec.rb b/spec/acceptance/zabbix_hostgroup_spec.rb index aa6a955b1..27dad8344 100644 --- a/spec/acceptance/zabbix_hostgroup_spec.rb +++ b/spec/acceptance/zabbix_hostgroup_spec.rb @@ -15,7 +15,9 @@ class { 'apache': mpm_module => 'prefork', } - include apache::mod::php + if $facts['os']['family'] != 'RedHat' { + include apache::mod::php + } class { 'postgresql::globals': locale => 'en_US.UTF-8', manage_package_repo => $facts['os']['release']['major'] != '8', diff --git a/spec/acceptance/zabbix_proxy_spec.rb b/spec/acceptance/zabbix_proxy_spec.rb index d77bc8b82..6e1f78e34 100644 --- a/spec/acceptance/zabbix_proxy_spec.rb +++ b/spec/acceptance/zabbix_proxy_spec.rb @@ -16,7 +16,9 @@ class { 'apache': mpm_module => 'prefork', } - include apache::mod::php + if $facts['os']['family'] != 'RedHat' { + include apache::mod::php + } class { 'postgresql::globals': locale => 'en_US.UTF-8', manage_package_repo => $facts['os']['release']['major'] != '8', diff --git a/spec/acceptance/zabbix_template_host_spec.rb b/spec/acceptance/zabbix_template_host_spec.rb index b200cf503..cce2d6a33 100644 --- a/spec/acceptance/zabbix_template_host_spec.rb +++ b/spec/acceptance/zabbix_template_host_spec.rb @@ -24,7 +24,9 @@ class { 'apache': mpm_module => 'prefork', } - include apache::mod::php + if $facts['os']['family'] != 'RedHat' { + include apache::mod::php + } class { 'postgresql::globals': locale => 'en_US.UTF-8', manage_package_repo => $facts['os']['release']['major'] != '8', diff --git a/spec/acceptance/zabbix_template_spec.rb b/spec/acceptance/zabbix_template_spec.rb index dc781897b..45689b632 100644 --- a/spec/acceptance/zabbix_template_spec.rb +++ b/spec/acceptance/zabbix_template_spec.rb @@ -15,7 +15,9 @@ class { 'apache': mpm_module => 'prefork', } - include apache::mod::php + if $facts['os']['family'] != 'RedHat' { + include apache::mod::php + } class { 'postgresql::globals': locale => 'en_US.UTF-8', manage_package_repo => $facts['os']['release']['major'] != '8', From aa55e436c82688fe0735de254ad878762f816b87 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 4 Oct 2023 14:09:41 +0200 Subject: [PATCH 3/3] skip tests that need a pre 6.0 server on el9 --- spec/acceptance/server_spec.rb | 2 ++ 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 ++ 7 files changed, 14 insertions(+) diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb index 941410b7d..337267926 100644 --- 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 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