Skip to content

Commit d4cdb49

Browse files
committed
(MODULES-11328) Removes Ubuntu 16.04
Ubuntu 16.04 hit end-of-life in April 2021. This commit removes this version of Ubuntu from the installation task and tests.
1 parent eb023df commit d4cdb49

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

spec/classes/puppet_agent_osfamily_debian_spec.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@
9393
it { is_expected.not_to contain_apt__setting('list-puppet-enterprise-installer') }
9494
end
9595

96-
context 'xenial' do
96+
context 'focal' do
9797
let(:facts) do
9898
facts.merge({
9999
is_pe: true,
100-
platform_tag: 'ubuntu-1604-x86_64',
100+
platform_tag: 'ubuntu-2004-x86_64',
101101
operatingsystem: 'Ubuntu',
102-
lsbdistcodename: 'xenial',
102+
lsbdistcodename: 'focal',
103103
os: {
104104
'name' => 'Ubuntu',
105105
'release' => {
106-
'full' => '16.04',
106+
'full' => '20.04',
107107
},
108108
},
109109
})
110110
end
111111

112-
context 'when managing debian xenial apt repo' do
112+
context 'when managing debian focal apt repo' do
113113
let(:params) do
114114
{
115115
manage_repo: true,
@@ -133,7 +133,7 @@
133133
}
134134
end
135135

136-
context 'when not managing debian xenial apt repo' do
136+
context 'when not managing debian focal apt repo' do
137137
let(:params) do
138138
{
139139
manage_repo: false,

tasks/install_shell.sh

-9
Original file line numberDiff line numberDiff line change
@@ -648,15 +648,6 @@ case $platform in
648648
"Ubuntu")
649649
info "Ubuntu platform! Lets get you a DEB..."
650650
case $platform_version in
651-
"12.04") deb_codename="precise";;
652-
"12.10") deb_codename="quantal";;
653-
"13.04") deb_codename="raring";;
654-
"13.10") deb_codename="saucy";;
655-
"14.04") deb_codename="trusty";;
656-
"14.10") deb_codename="trusty";;
657-
"15.04") deb_codename="vivid";;
658-
"15.10") deb_codename="wily";;
659-
"16.04") deb_codename="xenial";;
660651
"16.10") deb_codename="yakkety";;
661652
"17.04") deb_codename="zesty";;
662653
"18.04") deb_codename="bionic";;

0 commit comments

Comments
 (0)