Skip to content

Commit 012b369

Browse files
evgeniekohl
authored andcommitted
Add Ubuntu 22.04 support
1 parent b2139a3 commit 012b369

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@
7777
{
7878
"operatingsystem": "Ubuntu",
7979
"operatingsystemrelease": [
80-
"20.04"
80+
"20.04",
81+
"22.04"
8182
]
8283
},
8384
{

spec/acceptance/puppetserver_upgrade_spec.rb

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper_acceptance'
22

3-
unless unsupported_puppetserver
3+
unless unsupported_puppetserver || unsupported_puppetserver_upgrade
44
describe 'Scenario: minor version upgrade' do
55
before(:all) do
66
if check_for_package(default, 'puppetserver')
@@ -16,12 +16,7 @@
1616

1717
case ENV['BEAKER_PUPPET_COLLECTION']
1818
when 'puppet7'
19-
from_version =
20-
if fact('os.family') == 'RedHat' && fact('os.release.major') == '9'
21-
'7.13.0'
22-
else
23-
'7.6.0'
24-
end
19+
from_version = '7.6.0'
2520
to_version = '7.13.0'
2621
else
2722
raise 'Unsupported Puppet collection'

spec/support/acceptance/puppetserver.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,9 @@ def unsupported_puppetserver
88
host_inventory['facter']['os']['release']['major'] == '12'
99
end
1010
end
11+
12+
# These versions only have a single version (x.y.z) released so no upgrade is possible
13+
def unsupported_puppetserver_upgrade
14+
(fact('os.family') == 'RedHat' && fact('os.release.major') == '9') ||
15+
(fact('os.name') == 'Ubuntu' && fact('os.release.major') == '22.04')
16+
end

0 commit comments

Comments
 (0)