Merge pull request #496 from jay7x/drop_old_oses

Drop EOL RHEL, CentOS, Fedora, VirtuozzoLinux versions
voxpupuli · Nov 25, 2024 · 9f2451a · 9f2451a
2 parents 30accc8 + 3c21678
commit 9f2451a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 30 deletions.
diff --git a/data/RedHat-family-7.yaml b/data/RedHat-family-7.yaml
diff --git a/data/VirtuozzoLinux-7.yaml b/data/VirtuozzoLinux-7.yaml
diff --git a/metadata.json b/metadata.json
@@ -43,22 +43,13 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
-    {
-      "operatingsystem": "VirtuozzoLinux",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
-        "8",
         "9"
       ]
     },
@@ -92,8 +83,6 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "37",
-        "38",
         "40"
       ]
     }

diff --git a/spec/acceptance/nspwan_spec.rb b/spec/acceptance/nspwan_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper_acceptance'
 
 describe 'systemd with manage_nspawn true' do
-  machinectl = (fact('os.name') == 'Debian') && %w[10 11].include?(fact('os.release.major')) ? '/bin/machinectl' : '/usr/bin/machinectl'
+  machinectl = (fact('os.name') == 'Debian') && (fact('os.release.major') == '11') ? '/bin/machinectl' : '/usr/bin/machinectl'
 
   context 'configure nspawn' do
     let(:manifest) do

diff --git a/spec/defines/daemon_reload_spec.rb b/spec/defines/daemon_reload_spec.rb
@@ -26,11 +26,7 @@
             case [facts[:os]['name'], facts[:os]['family'], facts[:os]['release']['major']]
             when %w[Debian Debian 11],
               ['Ubuntu', 'Debian', '20.04'],
-              %w[VirtuozzoLinux RedHat 7],
               %w[AlmaLinux RedHat 8],
-              %w[CentOS RedHat 7],
-              %w[CentOS RedHat 8],
-              %w[RedHat RedHat 7],
               %w[RedHat RedHat 8],
               %w[Rocky RedHat 8],
               %w[OracleLinux RedHat 8]