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 Ubuntu 22.04 support #895

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Add Ubuntu 22.04 support #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -77,7 +77,8 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"20.04"
"20.04",
"22.04"
]
},
{
Expand Down
9 changes: 2 additions & 7 deletions spec/acceptance/puppetserver_upgrade_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper_acceptance'

unless unsupported_puppetserver
unless unsupported_puppetserver || unsupported_puppetserver_upgrade
describe 'Scenario: minor version upgrade' do
before(:all) do
if check_for_package(default, 'puppetserver')
Expand All @@ -16,12 +16,7 @@

case ENV['BEAKER_PUPPET_COLLECTION']
when 'puppet7'
from_version =
if fact('os.family') == 'RedHat' && fact('os.release.major') == '9'
'7.13.0'
else
'7.6.0'
end
from_version = '7.6.0'
to_version = '7.13.0'
else
raise 'Unsupported Puppet collection'
Expand Down
6 changes: 6 additions & 0 deletions spec/support/acceptance/puppetserver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ def unsupported_puppetserver
host_inventory['facter']['os']['release']['major'] == '12'
end
end

# These versions only have a single version (x.y.z) released so no upgrade is possible
def unsupported_puppetserver_upgrade
evgeni marked this conversation as resolved.
Show resolved Hide resolved
(fact('os.family') == 'RedHat' && fact('os.release.major') == '9') ||
(fact('os.name') == 'Ubuntu' && fact('os.release.major') == '22.04')
end
Loading