From 3c21678dcc2c6dc577bf011f778b97891e0aa9b4 Mon Sep 17 00:00:00 2001 From: Yury Bushmelev Date: Thu, 31 Oct 2024 12:12:05 +0800 Subject: [PATCH] Drop EOL OSes * VirtuozzoLinux 7 * Fedora 38, 39 * Centos 7, 8 * RHEL 7 --- data/RedHat-family-7.yaml | 8 -------- data/VirtuozzoLinux-7.yaml | 6 ------ metadata.json | 11 ----------- spec/acceptance/nspwan_spec.rb | 2 +- spec/defines/daemon_reload_spec.rb | 4 ---- 5 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 data/RedHat-family-7.yaml delete mode 100644 data/VirtuozzoLinux-7.yaml diff --git a/data/RedHat-family-7.yaml b/data/RedHat-family-7.yaml deleted file mode 100644 index 49f067d7..00000000 --- a/data/RedHat-family-7.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -systemd::nspawn_package: ~ - -systemd::accounting: - DefaultCPUAccounting: 'yes' - DefaultBlockIOAccounting: 'yes' - DefaultMemoryAccounting: 'yes' - DefaultTasksAccounting: 'yes' diff --git a/data/VirtuozzoLinux-7.yaml b/data/VirtuozzoLinux-7.yaml deleted file mode 100644 index 888cb176..00000000 --- a/data/VirtuozzoLinux-7.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -systemd::accounting: - DefaultCPUAccounting: 'yes' - DefaultBlockIOAccounting: 'yes' - DefaultMemoryAccounting: 'yes' - DefaultTasksAccounting: 'yes' diff --git a/metadata.json b/metadata.json index aa92784b..785f0ca2 100644 --- 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 index 1442750f..d4ff6477 100644 --- 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 index 3288e12d..1edd0c2f 100644 --- 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]