Remove spec filter and run spec on all supported OS

.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

manifests/params.pp

@@ -20,6 +20,7 @@
       $server_zabbix_user       = 'zabbix'
       $zabbix_package_provider  = undef
       $agent_loadmodulepath     = '/usr/lib/modules'
+      $manage_startup_script    = false
     }
     'AIX': {
       $manage_repo              = false
@@ -32,6 +33,7 @@
       $agent_config_group       = 'zabbix'
       $agent_pidfile            = '/var/run/zabbix/zabbix_agentd.pid'
       $agent_servicename        = 'zabbix-agent'
+      $manage_startup_script    = true
     }
     'Archlinux': {
       $server_fpinglocation     = '/usr/bin/fping'
@@ -51,6 +53,7 @@
       $server_zabbix_user       = 'zabbix-server'
       $zabbix_package_provider  = undef
       $agent_loadmodulepath     = '/usr/lib/modules'
+      $manage_startup_script    = false
     }
     'FreeBSD': {
       $manage_repo              = false
@@ -66,6 +69,7 @@
       $server_zabbix_user       = 'zabbix'
       $zabbix_package_provider  = undef
       $agent_loadmodulepath     = '/usr/local/lib/zabbix/modules'
+      $manage_startup_script    = false
     }
     'Gentoo': {
       $server_fpinglocation     = '/usr/sbin/fping'
@@ -85,6 +89,7 @@
       $server_zabbix_user       = 'zabbix'
       $zabbix_package_provider  = undef
       $agent_loadmodulepath     = '/usr/lib/modules'
+      $manage_startup_script    = false
     }
     'windows': {
       $manage_repo             = false
@@ -99,6 +104,7 @@
       $agent_servicename       = 'Zabbix Agent'
       $agent_include           = 'C:/ProgramData/zabbix/zabbix_agentd.d'
       $agent_loadmodulepath    = undef
+      $manage_startup_script   = false
     }
     default  : {
       $server_fpinglocation     = '/usr/sbin/fping'
@@ -118,6 +124,7 @@
       $server_zabbix_user       = 'zabbix'
       $zabbix_package_provider  = undef
       $agent_loadmodulepath     = '/usr/lib/modules'
+      $manage_startup_script    = false
     }
   }
 
@@ -129,12 +136,6 @@
     $zabbix_version = '6.0'
   }
 
-  $manage_startup_script = downcase($facts['kernel']) ? {
-    'windows' => false,
-    'FreeBSD' => false,
-    default   => true,
-  }
-
   $zabbix_package_state                     = 'present'
   $zabbix_proxy                             = 'localhost'
   $zabbix_proxy_ip                          = '127.0.0.1'

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'

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"
     },

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,22 +82,30 @@
             )
           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
             is_expected.to contain_service(service_name).
               with_ensure('running').
               with_enable(true).
-              with_service_provider(facts[:os]['family'] == 'AIX' ? 'init' : nil).
-              that_requires(["Package[#{package_name}]", "Zabbix::Startup[#{service_name}]"])
+              with_service_provider(facts[:os]['family'] == 'AIX' ? 'init' : nil)
           end
 
-          it { is_expected.to contain_zabbix__startup(service_name).that_requires("Package[#{package_name}]") }
+          it { is_expected.not_to contain_zabbix__startup(service_name) }
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_class('zabbix::params') }
         end
@@ -104,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,29 +233,40 @@
         it { is_expected.not_to contain_firewall('150 zabbix-agent from 10.11.12.13') }
       end
 
-      context 'it creates a startup script' do
-        if facts[:kernel] == 'Linux'
-          case facts[:os]['family']
-          when 'Archlinux', 'Debian', 'Gentoo', 'RedHat'
-            it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('absent') }
-            it { is_expected.to contain_file("/etc/systemd/system/#{service_name}.service").with_ensure('file') }
-          when 'windows'
-            it { is_expected.to contain_exec("install_agent_#{service_name}") }
-          else
-            it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('file') }
-            it { is_expected.not_to contain_file("/etc/systemd/system/#{service_name}.service") }
-          end
-        end
-      end
+      context 'when declaring manage_startup_script is true' do
+        next if facts[:os]['family'] == 'FreeBSD'
+        next if facts[:os]['family'] == 'Gentoo'
 
-      context 'when declaring manage_startup_script is false' do
         let :params do
           {
-            manage_startup_script: false
+            manage_startup_script: true
           }
         end
 
-        it { is_expected.not_to contain_zabbix__startup(service_name) }
+        context 'it creates a startup script' do
+          if facts[:kernel] == 'Linux'
+            case facts[:os]['family']
+            when 'Archlinux', 'Debian', 'Gentoo', 'RedHat'
+              it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('absent') }
+              it { is_expected.to contain_file("/etc/systemd/system/#{service_name}.service").with_ensure('file') }
+            when 'windows'
+              it { is_expected.to contain_exec("install_agent_#{service_name}") }
+            else
+              it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('file') }
+              it { is_expected.not_to contain_file("/etc/systemd/system/#{service_name}.service") }
+            end
+          end
+        end
+
+        it do
+          is_expected.to contain_service(service_name).
+            with_ensure('running').
+            with_enable(true).
+            with_service_provider(facts[:os]['family'] == 'AIX' ? 'init' : nil).
+            that_requires(["Package[#{package_name}]", "Zabbix::Startup[#{service_name}]"])
+        end
+
+        it { is_expected.to contain_zabbix__startup(service_name).that_requires("Package[#{package_name}]") }
       end
 
       context 'when declaring zabbix_alias' do
@@ -460,17 +486,19 @@
         end
       end
 
-      describe 'with systemd active' do
+      describe 'with systemd active', skip: 'user package provided instead systemd::unit_file ' do
         if facts[:kernel] == 'Linux'
           let :facts do
             super().merge(systemd: true)
           end
 
           it { is_expected.to contain_systemd__unit_file('zabbix-agent.service') }
         end
       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,

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

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

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

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