Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Ubuntu 22.04 #1514

Merged
merged 2 commits into from
Aug 24, 2022
Merged

Add support for Ubuntu 22.04 #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5794f89
Add support for Ubuntu 22.04
smortex Aug 24, 2022
6e25548
Replace legacy facts with modern equivalents
smortex Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"18.04",
"20.04"
"20.04",
"22.04"
]
}
]
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/class_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
pkg_match = case fact('operatingsystemmajrelease')
when '10', '11'
%r{Debian Nginx Maintainers}
when '18.04', '20.04'
when '18.04', '20.04', '22.04'
%r{Ubuntu Developers}
else
%r{Phusion}
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/nginx_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@

it { is_expected.to contain_package('nginx') }

if (facts[:lsbdistid] == 'Debian' && %w[10 11].include?(facts.dig(:os, 'release', 'major'))) ||
(facts[:lsbdistid] == 'Ubuntu' && %w[bionic focal].include?(facts[:lsbdistcodename]))
if (facts.dig(:os, 'name') == 'Debian' && %w[10 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
it { is_expected.to contain_package('passenger') }
Expand Down