Drop Ubuntu 16.04, Debian 9, Fedora 31, SLES 11, Windows 8; add F36, EL9

Author: ekohl

metadata.json

@@ -43,13 +43,15 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
+        "8",
         "8"
       ]
     },
@@ -62,20 +64,19 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "31"
+        "36"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9",
-        "10"
+        "10",
+        "11"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04",
         "20.04"
       ]
@@ -99,14 +100,12 @@
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "11",
         "12"
       ]
     },
     {
       "operatingsystem": "windows",
       "operatingsystemrelease": [
-        "8",
         "2012",
         "2012 R2"
       ]

spec/classes/puppet_agent_spec.rb

@@ -94,7 +94,7 @@
 
         it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(false) }
         case os
-        when /\Adebian-/, /\A(redhat|centos|scientific)-(7|8)/, /\Afedora-/, /\Aubuntu-/, /\Asles-12-/, /\Aarchlinux-/
+        when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux)-/
           it do
             is_expected.to contain_service('puppet-run.timer')
               .with_ensure(false)
@@ -171,7 +171,7 @@
           case os
           when /\A(windows|archlinux)/
             it { is_expected.to raise_error(Puppet::Error, /Runmode of cron not supported on #{facts[:kernel]} operating systems!/) }
-          when /\Adebian-/, /\A(redhat|centos|scientific)-(7|8)/, /\Afedora-/, /\Aubuntu-/, /\Asles-12/
+          when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles)-/
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_concat__fragment('puppet.conf_agent') }
             it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(true) }
@@ -219,7 +219,7 @@
           case os
           when /\A(windows|archlinux)/
             it { is_expected.to raise_error(Puppet::Error, /Runmode of cron not supported on #{facts[:kernel]} operating systems!/) }
-          when /\Adebian-/, /\A(redhat|centos|scientific)-(7|8)/, /\Afedora-/, /\Aubuntu-/, /\Asles-12/
+          when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles)-/
             it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(true) }
             it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
             it do
@@ -260,7 +260,7 @@
           end
 
           case os
-          when /\Adebian-/, /\A(redhat|centos|scientific)-(7|8)/, /\Afedora-/, /\Aubuntu-/, /\Asles-12/, /\Aarchlinux-/
+          when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux)-/
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
             it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(false) }
@@ -303,7 +303,7 @@
           end
 
           case os
-          when /\Adebian-/, /\A(redhat|centos|scientific)-(7|8)/, /\Afedora-/, /\Aubuntu-/, /\Asles-12/, /\Aarchlinux-/
+          when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux)-/
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
             it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(false) }
@@ -351,7 +351,7 @@
           it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(false) }
 
           case os
-          when /\Adebian-/, /\A(redhat|centos|scientific)-(7|8)/, /\Afedora-/, /\Aubuntu-/, /\Asles-12/, /\Aarchlinux-/
+          when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux)-/
             it { is_expected.to contain_service('puppet-run.timer').with_ensure(false) }
           else
             it { is_expected.not_to contain_service('puppet-run.timer') }

spec/support/acceptance/puppetserver.rb

@@ -4,6 +4,8 @@ def unsupported_puppetserver
     true
   when 'Fedora'
     true
+  when 'Debian'
+    host_inventory['facter']['os']['release']['major'] == '11'
   when 'Ubuntu'
     ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6' && host_inventory['facter']['os']['release']['major'] == '20.04'
   end