From 6bd3d5972153aec39a3feca0070b55bb91fc6416 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 3 May 2023 20:37:16 +0200 Subject: [PATCH 1/2] Drop EOL Debian 9 --- metadata.json | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata.json b/metadata.json index f5097bd..69724de 100644 --- a/metadata.json +++ b/metadata.json @@ -44,7 +44,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "9", "10" ] }, From 1618d4444999490cf2a3e48b0f5cc490c002ce5c Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 3 May 2023 20:56:36 +0200 Subject: [PATCH 2/2] Drop EOL Ubuntu 16.04 --- metadata.json | 1 - spec/defines/cache_dir_spec.rb | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/metadata.json b/metadata.json index 69724de..678f354 100644 --- a/metadata.json +++ b/metadata.json @@ -77,7 +77,6 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "16.04", "18.04" ] } diff --git a/spec/defines/cache_dir_spec.rb b/spec/defines/cache_dir_spec.rb index 23c50f5..1ef4705 100644 --- a/spec/defines/cache_dir_spec.rb +++ b/spec/defines/cache_dir_spec.rb @@ -40,17 +40,9 @@ it { is_expected.to contain_file('/data').with_group('proxy') } end when 'Ubuntu' - case facts[:operatingsystemrelease] - when '14.04' - context 'when on Ubuntu 14.04' do - it { is_expected.to contain_file('/data').with_owner('proxy') } - it { is_expected.to contain_file('/data').with_group('proxy') } - end - when '16.04' - context 'when on Ubuntu 16.04' do - it { is_expected.to contain_file('/data').with_owner('proxy') } - it { is_expected.to contain_file('/data').with_group('proxy') } - end + context 'when on Ubuntu' do + it { is_expected.to contain_file('/data').with_owner('proxy') } + it { is_expected.to contain_file('/data').with_group('proxy') } end else context 'when on any other non-debian OS' do