Drop EoL RHEL 6 support

voxpupuli · Jun 29, 2023 · 6a4b3de · 6a4b3de
1 parent 2dadf70
commit 6a4b3de
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 22 deletions.
diff --git a/data/os/RedHat/CentOS/5.yaml b/data/os/RedHat/CentOS/5.yaml
diff --git a/data/os/RedHat/CentOS/6.yaml b/data/os/RedHat/CentOS/6.yaml
diff --git a/data/os/RedHat/OracleLinux/5.yaml b/data/os/RedHat/OracleLinux/5.yaml
diff --git a/data/os/RedHat/OracleLinux/6.yaml b/data/os/RedHat/OracleLinux/6.yaml
diff --git a/data/os/RedHat/RedHat/5.yaml b/data/os/RedHat/RedHat/5.yaml
diff --git a/data/os/RedHat/RedHat/6.yaml b/data/os/RedHat/RedHat/6.yaml
diff --git a/data/os/RedHat/Scientific/5.yaml b/data/os/RedHat/Scientific/5.yaml
diff --git a/data/os/RedHat/Scientific/6.yaml b/data/os/RedHat/Scientific/6.yaml
diff --git a/lib/puppet/provider/selinux_fcontext/semanage.rb b/lib/puppet/provider/selinux_fcontext/semanage.rb
@@ -13,9 +13,6 @@
   osversion       = Facter.value('operatingsystemmajrelease')
   operatingsystem = Facter.value('operatingsystem')
   @old_semanage = false
-  if (osfamily == 'RedHat') && (Puppet::Util::Package.versioncmp(osversion, '6') <= 0) && (operatingsystem != 'Amazon')
-    @old_semanage = true
-  end
 
   @file_types = {
     'all files' => 'a',

diff --git a/metadata.json b/metadata.json
@@ -11,15 +11,13 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]

diff --git a/spec/classes/selinux_package_spec.rb b/spec/classes/selinux_package_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'selinux' do
   context 'package' do
-    %w[6 7].each do |majrelease|
+    %w[7].each do |majrelease|
       context "On RedHat #{majrelease} based OSes" do
         let(:facts) do
           {
@@ -14,6 +14,7 @@
           }
         end
 
+        it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_package('policycoreutils-python').with(ensure: 'installed') }
         it { is_expected.not_to contain_package('auditd') }
       end
@@ -30,6 +31,7 @@
         }
       end
 
+      it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_package('policycoreutils-python-utils').with(ensure: 'installed') }
     end
 
@@ -45,6 +47,7 @@
           }
         end
 
+        it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_package('policycoreutils-python-utils').with(ensure: 'installed') }
       end
     end
@@ -60,6 +63,7 @@
         }
       end
 
+      it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_package('policycoreutils').with(ensure: 'installed') }
     end
 
@@ -74,6 +78,8 @@
         }
       end
 
+      it { is_expected.to compile.with_all_deps }
+
       %w[policycoreutils-python-utils selinux-basics selinux-policy-default auditd].each do |package|
         it { is_expected.to contain_package(package).with(ensure: 'installed') }
       end
@@ -94,6 +100,7 @@
         }
       end
 
+      it { is_expected.to compile.with_all_deps }
       it { is_expected.not_to contain_package('policycoreutils-python').with(ensure: 'installed') }
     end
 
@@ -112,6 +119,7 @@
         }
       end
 
+      it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_package('some_package').with(ensure: 'installed') }
     end
 
@@ -130,6 +138,7 @@
         }
       end
 
+      it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_package('setroubleshoot').with(ensure: 'installed') }
       it { is_expected.to contain_package('setroubleshoot-plugins').with(ensure: 'installed') }
     end
@@ -149,6 +158,7 @@
         }
       end
 
+      it { is_expected.to compile.with_all_deps }
       it { is_expected.to contain_package('policycoreutils-sandbox').with(ensure: 'installed') }
       it { is_expected.to contain_package('selinux-policy-sandbox').with(ensure: 'installed') }
     end