From 7aed0c991334a617e6a83ad048c9f1f968535c0a Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Sun, 26 May 2024 21:26:13 +0200 Subject: [PATCH] drop support for Debian 10 there is already breaking changes on master, so next releease will be major --- metadata.json | 1 - spec/acceptance/class_spec.rb | 2 +- spec/classes/nginx_spec.rb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/metadata.json b/metadata.json index af73891b7..2d5a4803f 100644 --- a/metadata.json +++ b/metadata.json @@ -27,7 +27,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "10", "11" ] }, diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 1cb3e09b1..eaf361574 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -19,7 +19,7 @@ pkg_cmd = 'dpkg -s nginx | grep ^Maintainer' pkg_remove_cmd = 'apt-get -y purge nginx nginx-common' pkg_match = case fact('operatingsystemmajrelease') - when '10', '11' + when '11' %r{Debian Nginx Maintainers} when '18.04', '20.04', '22.04' %r{Ubuntu Developers} diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb index 716290775..b0ba21406 100644 --- a/spec/classes/nginx_spec.rb +++ b/spec/classes/nginx_spec.rb @@ -190,7 +190,7 @@ it { is_expected.to contain_package('nginx') } - if (facts.dig(:os, 'name') == 'Debian' && %w[10 11].include?(facts.dig(:os, 'release', 'major'))) || + if (facts.dig(:os, 'name') == 'Debian' && %w[11].include?(facts.dig(:os, 'release', 'major'))) || (facts.dig(:os, 'name') == 'Ubuntu' && %w[bionic focal jammy].include?(facts.dig(:os, 'distro', 'codename'))) it { is_expected.to contain_package('libnginx-mod-http-passenger') } else