Merge pull request #968 from Valantin/fix/spec

Remove spec filter and run spec on all supported OS
voxpupuli · Jun 28, 2024 · 5db0077 · 5db0077
2 parents 24dabc3 + 56c384a
commit 5db0077
Show file tree

Hide file tree

Showing 17 changed files with 417 additions and 469 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -8,7 +8,6 @@ spec/spec_helper.rb:
   mock_with: ':mocha'
   spec_overrides:
     - "require 'support/acceptance/supported_versions'"
-    - "require 'spec_helper_methods'"
 .puppet-lint.rc:
   enabled_lint_checks:
     - parameter_documentation

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -18,19 +18,9 @@
   String[1]                 $zabbix_version            = $zabbix::params::zabbix_version,
 ) inherits zabbix::params {
   if $manage_repo {
-    case $facts['os']['name'] {
-      'PSBM': {
-        $majorrelease = '6'
-      }
-      'Amazon': {
-        $majorrelease = '6'
-      }
-      default: {
-        $majorrelease = $facts['os']['release']['major']
-      }
-    }
     case $facts['os']['family'] {
       'RedHat': {
+        $majorrelease = $facts['os']['release']['major']
         if (versioncmp(fact('os.release.major'), '7') >= 0 and $zabbix_version == '7.0') {
           $gpgkey_zabbix = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005'
           $gpgkey_nonsupported = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005'

diff --git a/metadata.json b/metadata.json
@@ -64,13 +64,6 @@
         "9"
       ]
     },
-    {
-      "operatingsystem": "Amazon",
-      "operatingsystemrelease": [
-        "7",
-        "8"
-      ]
-    },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
@@ -79,18 +72,10 @@
         "9"
       ]
     },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "7",
-        "8"
-      ]
-    },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8",
         "9"
       ]
     },
@@ -108,19 +93,6 @@
         "9"
       ]
     },
-    {
-      "operatingsystem": "CloudLinux",
-      "operatingsystemrelease": [
-        "7",
-        "8"
-      ]
-    },
-    {
-      "operatingsystem": "XenServer",
-      "operatingsystemrelease": [
-        "6"
-      ]
-    },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
@@ -135,12 +107,6 @@
         "12"
       ]
     },
-    {
-      "operatingsystem": "VirtuozzoLinux",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Archlinux"
     },

diff --git a/spec/classes/agent_spec.rb b/spec/classes/agent_spec.rb
@@ -14,11 +14,13 @@
     }
   end
 
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     context "on #{os}" do
       config_path = case facts[:os]['name']
                     when 'windows'
                       'C:/ProgramData/zabbix/zabbix_agentd.conf'
+                    when 'FreeBSD'
+                      '/usr/local/etc/zabbix6/zabbix_agentd.conf'
                     else
                       '/etc/zabbix/zabbix_agentd.conf'
                     end
@@ -32,6 +34,8 @@
       include_dir = case facts[:os]['name']
                     when 'windows'
                       'C:/ProgramData/zabbix/zabbix_agentd.d'
+                    when 'FreeBSD'
+                      '/usr/local/etc/zabbix6/zabbix_agentd.d'
                     else
                       '/etc/zabbix/zabbix_agentd.d'
                     end
@@ -50,6 +54,9 @@
       when 'windows'
         package_name = 'zabbix-agent'
         service_name = 'Zabbix Agent'
+      when 'FreeBSD'
+        package_name = 'zabbix6-agent'
+        service_name = 'zabbix_agentd'
       else
         package_name = 'zabbix-agent'
         service_name = 'zabbix-agent'
@@ -60,7 +67,7 @@
       context 'with all defaults' do
         it { is_expected.to contain_selinux__module('zabbix-agent') }            if facts[:os]['family'] == 'RedHat'
         it { is_expected.to contain_yumrepo('zabbix-frontend') }                 if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-        it { is_expected.to contain_package('zabbix-required-scl-repo') }        if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
+        it { is_expected.to contain_package('zabbix-required-scl-repo') }        if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7' && %w[OracleLinux CentOS].include?(facts[:os]['name'])
         it { is_expected.to contain_apt__key('zabbix-A1848F5') }                 if facts[:os]['family'] == 'Debian'
         it { is_expected.to contain_apt__key('zabbix-FBABD5F') }                 if facts[:os]['family'] == 'Debian'
         it { is_expected.to contain_file(include_dir).with_ensure('directory') }
@@ -75,11 +82,20 @@
             )
           end
         else
-          it do
-            is_expected.to contain_package(package_name).
-              with_ensure('present').
-              with_tag('zabbix').
-              that_requires('Class[zabbix::repo]')
+
+          if facts[:os]['family'] == 'Gentoo'
+            it do
+              is_expected.to contain_package(package_name).
+                with_ensure('present').
+                with_tag('zabbix')
+            end
+          else
+            it do
+              is_expected.to contain_package(package_name).
+                with_ensure('present').
+                with_tag('zabbix').
+                that_requires('Class[zabbix::repo]')
+            end
           end
 
           it do
@@ -103,7 +119,7 @@
         end
 
         case facts[:os]['family']
-        when 'Archlinux'
+        when %w[Archlinux Gentoo FreeBSD].include?(facts[:os]['family'])
           it { is_expected.not_to compile.with_all_deps }
         when 'Debian'
           # rubocop:disable RSpec/RepeatedExample
@@ -218,6 +234,9 @@
       end
 
       context 'when declaring manage_startup_script is true' do
+        next if facts[:os]['family'] == 'FreeBSD'
+        next if facts[:os]['family'] == 'Gentoo'
+
         let :params do
           {
             manage_startup_script: true
@@ -478,6 +497,8 @@
       end
 
       context 'when zabbix_package_agent is zabbix-agent2' do
+        next if facts[:os]['family'] == 'Gentoo'
+
         let :params do
           {
             zabbix_package_agent: 'zabbix-agent2', startagents: 1,

diff --git a/spec/classes/database_mysql_spec.rb b/spec/classes/database_mysql_spec.rb
@@ -7,7 +7,7 @@
     'rspec.puppet.com'
   end
 
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     next if facts[:os]['name'] == 'windows'
 
     context "on #{os}" do

diff --git a/spec/classes/database_postgresql_spec.rb b/spec/classes/database_postgresql_spec.rb
@@ -7,7 +7,7 @@
     'rspec.puppet.com'
   end
 
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     next if facts[:os]['name'] == 'windows'
 
     context "on #{os}" do

diff --git a/spec/classes/database_spec.rb b/spec/classes/database_spec.rb
@@ -7,7 +7,7 @@
     'rspec.puppet.com'
   end
 
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     next if facts[:os]['name'] == 'windows'
 
     context "on #{os}" do

diff --git a/spec/classes/javagateway_spec.rb b/spec/classes/javagateway_spec.rb
@@ -7,7 +7,7 @@
     'rspec.puppet.com'
   end
 
-  on_supported_os(baseline_os_hash).each do |os, facts|
+  on_supported_os.each do |os, facts|
     next if facts[:os]['name'] == 'windows'
 
     context "on #{os}" do
@@ -28,7 +28,7 @@
         it { is_expected.to contain_service('zabbix-java-gateway').with_require(['Package[zabbix-java-gateway]', 'File[/etc/zabbix/zabbix_java_gateway.conf]']) }
 
         it { is_expected.to contain_yumrepo('zabbix-frontend') }          if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-        it { is_expected.to contain_package('zabbix-required-scl-repo') } if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
+        it { is_expected.to contain_package('zabbix-required-scl-repo') } if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7' && %w[OracleLinux CentOS].include?(facts[:os]['name'])
         it { is_expected.to contain_apt__key('zabbix-A1848F5') }          if facts[:os]['family'] == 'Debian'
         it { is_expected.to contain_apt__key('zabbix-FBABD5F') }          if facts[:os]['family'] == 'Debian'
       end