Skip to content

Commit

Permalink
Merge pull request #145 from root-expert/ubuntu24
Browse files Browse the repository at this point in the history
Add support for Ubuntu 24.04
  • Loading branch information
ekohl authored Sep 13, 2024
2 parents 7c7dcad + 31a49c2 commit da64730
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions lib/puppet_metadata/aio.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class AIO
'18.04' => 5..8,
'20.04' => 6..8,
'22.04' => 6..8,
'24.04' => 7..8,
},
}.freeze

Expand Down
1 change: 1 addition & 0 deletions lib/puppet_metadata/operatingsystem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ class OperatingSystem
},
# https://endoflife.software/operating-systems/linux/ubuntu
'Ubuntu' => {
'24.04' => '2029-04-30',
'22.04' => '2027-04-15',
'21.10' => '2022-07-15',
'20.10' => '2021-07-15',
Expand Down
4 changes: 2 additions & 2 deletions spec/metadata_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
},
{
operatingsystem: 'Ubuntu',
operatingsystemrelease: ['14.04', '16.04', '18.04', '20.04', '22.04'],
operatingsystemrelease: ['14.04', '16.04', '18.04', '20.04', '22.04', '24.04'],
},
],
}
Expand All @@ -94,7 +94,7 @@
'CentOS' => %w[7 8 9],
'Debian' => %w[9 10],
'RedHat' => %w[7 8 9],
'Ubuntu' => ['14.04', '16.04', '18.04', '20.04', '22.04'],
'Ubuntu' => ['14.04', '16.04', '18.04', '20.04', '22.04', '24.04'],
}
is_expected.to eq(expected)
end
Expand Down
8 changes: 4 additions & 4 deletions spec/operatingsystem_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
expect(described_class.latest_release('CentOS')).to eq('9')
end

it 'returns 22.04 for Ubuntu' do
expect(described_class.latest_release('Ubuntu')).to eq('22.04')
it 'returns 24.04 for Ubuntu' do
expect(described_class.latest_release('Ubuntu')).to eq('24.04')
end
end

Expand All @@ -33,8 +33,8 @@
context 'with Ubuntu' do
let(:os) { 'Ubuntu' }

it 'returns 20.04 and 22.04' do
expect(described_class.supported_releases(os)).to contain_exactly('20.04', '22.04')
it 'returns 20.04, 22.04 and 24.04' do
expect(described_class.supported_releases(os)).to contain_exactly('20.04', '22.04', '24.04')
end

it 'the last entry matches latest_release' do
Expand Down

0 comments on commit da64730

Please sign in to comment.