Skip to content

Commit 12a5052

Browse files
authored
Merge pull request #1065 from d1nuc0m/eol-ubuntu-20.04
chore: drop EOL Ubuntu 20.04
2 parents 4ffefd5 + b097e07 commit 12a5052

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

metadata.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
{
6161
"operatingsystem": "Ubuntu",
6262
"operatingsystemrelease": [
63-
"20.04",
6463
"22.04"
6564
]
6665
},

spec/classes/collectd_plugin_rabbitmq_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
end
2727

2828
case [facts['os']['family'], facts['os']['release']['major']]
29-
when %w[RedHat 8], %w[RedHat 9], %w[Ubuntu 20.04]
29+
when %w[RedHat 8], %w[RedHat 9]
3030
it { is_expected.to raise_error(%r{does not support Python 3}) }
3131
else
3232
it 'import collectd_rabbitmq.collectd_plugin in python-config' do
@@ -69,7 +69,7 @@
6969
end
7070

7171
case [facts['os']['family'], facts['os']['release']['major']]
72-
when %w[RedHat 8], %w[RedHat 9], %w[Ubuntu 20.04]
72+
when %w[RedHat 8], %w[RedHat 9]
7373
it { is_expected.to raise_error(%r{does not support Python 3}) }
7474
else
7575
it 'override custom TypesDB' do
@@ -84,7 +84,7 @@
8484
end
8585

8686
case [facts['os']['family'], facts['os']['release']['major']]
87-
when %w[RedHat 8], %w[RedHat 9], %w[Ubuntu 20.04]
87+
when %w[RedHat 8], %w[RedHat 9]
8888
it { is_expected.to raise_error(%r{does not support Python 3}) }
8989
else
9090
it 'override Username to foo in python-config' do
@@ -99,7 +99,7 @@
9999
end
100100

101101
case [facts['os']['family'], facts['os']['release']['major']]
102-
when %w[RedHat 8], %w[RedHat 9], %w[Ubuntu 20.04]
102+
when %w[RedHat 8], %w[RedHat 9]
103103
it { is_expected.to raise_error(%r{does not support Python 3}) }
104104
else
105105
it 'override Username to foo in python-config' do
@@ -114,7 +114,7 @@
114114
end
115115

116116
case [facts['os']['family'], facts['os']['release']['major']]
117-
when %w[RedHat 8], %w[RedHat 9], %w[Ubuntu 20.04]
117+
when %w[RedHat 8], %w[RedHat 9]
118118
it { is_expected.to raise_error(%r{does not support Python 3}) }
119119
else
120120
it 'override Username to foo in python-config' do
@@ -130,7 +130,7 @@
130130
end
131131

132132
case [facts['os']['family'], facts['os']['release']['major']]
133-
when %w[RedHat 8], %w[RedHat 9], %w[Ubuntu 20.04]
133+
when %w[RedHat 8], %w[RedHat 9]
134134
it { is_expected.to raise_error(%r{does not support Python 3}) }
135135
else
136136
it 'Will remove python-config' do
@@ -157,7 +157,7 @@
157157
end
158158

159159
case [facts['os']['family'], facts['os']['release']['major']]
160-
when %w[RedHat 8], %w[RedHat 9], %w[Ubuntu 20.04]
160+
when %w[RedHat 8], %w[RedHat 9]
161161
it { is_expected.to raise_error(%r{does not support Python 3}) }
162162
else
163163
it do

0 commit comments

Comments
 (0)