Add Ubuntu 22.04 support

Add Ubuntu 22.04 in metadata.json skip acceptance for zabbix version 5.0 because not supported Fix voxpupuli#925
Valantin · Mar 7, 2024 · fcc628a · fcc628a
1 parent 8242ce9
commit fcc628a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 2 deletions.
diff --git a/metadata.json b/metadata.json
@@ -124,7 +124,8 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "20.04"
+        "20.04",
+				"22.04"
       ]
     },
     {

diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
@@ -43,6 +43,8 @@ class { 'zabbix::database': }
     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'
+    # <6.0 server packages are not available for ubuntu 22.04
+    next if zabbix_version < '6.0' && default[:platform] =~ %r{ubuntu-22}
 
     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
@@ -9,6 +9,8 @@
     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'
+    # <6.0 server packages are not available for ubuntu 22.04
+    next if zabbix_version < '6.0' && default[:platform] =~ %r{ubuntu-22}
 
     template = case zabbix_version
                when '5.0'

diff --git a/spec/acceptance/zabbix_host_spec.rb b/spec/acceptance/zabbix_host_spec.rb
@@ -10,6 +10,8 @@
     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'
+    # <6.0 server packages are not available for ubuntu 22.04
+    next if zabbix_version < '6.0' && default[:platform] =~ %r{ubuntu-22}
 
     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
@@ -9,6 +9,8 @@
     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'
+    # <6.0 server packages are not available for ubuntu 22.04
+    next if zabbix_version < '6.0' && default[:platform] =~ %r{ubuntu-22}
 
     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
@@ -10,6 +10,8 @@
     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'
+    # <6.0 server packages are not available for ubuntu 22.04
+    next if zabbix_version < '6.0' && default[:platform] =~ %r{ubuntu-22}
 
     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
@@ -11,6 +11,8 @@
     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'
+    # <6.0 server packages are not available for ubuntu 22.04
+    next if zabbix_version < '6.0' && default[:platform] =~ %r{ubuntu-22}
 
     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
@@ -9,6 +9,8 @@
     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'
+    # <6.0 server packages are not available for ubuntu 22.04
+    next if zabbix_version < '6.0' && default[:platform] =~ %r{ubuntu-22}
 
     context "create zabbix_template resources with zabbix version #{zabbix_version}" do
       # This will deploy a running Zabbix setup (server, web, db) which we can

diff --git a/spec/spec_helper_methods.rb b/spec/spec_helper_methods.rb
@@ -13,7 +13,7 @@ def baseline_os_hash
       },
       {
         'operatingsystem' => 'Ubuntu',
-        'operatingsystemrelease' => %w[20.04]
+        'operatingsystemrelease' => %w[20.04 22.04]
       },
       {
         'operatingsystem' => 'Archlinux',