Drop EOL OSes

* VirtuozzoLinux 7 * Fedora 38, 39 * Centos 7, 8 * RHEL 7
voxpupuli · Nov 3, 2024 · 0ceca8f · 0ceca8f
1 parent 291b9e1
commit 0ceca8f
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 42 deletions.
diff --git a/data/Fedora.yaml b/data/Fedora.yaml
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
@@ -42,22 +42,13 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
-    {
-      "operatingsystem": "VirtuozzoLinux",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
-        "8",
         "9"
       ]
     },
@@ -87,13 +78,6 @@
     },
     {
       "operatingsystem": "Gentoo"
-    },
-    {
-      "operatingsystem": "Fedora",
-      "operatingsystemrelease": [
-        "37",
-        "38"
-      ]
     }
   ],
   "requirements": [

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,8 @@
             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]