File tree Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Expand file tree Collapse file tree 3 files changed +10
-8
lines changed Original file line number Diff line number Diff line change 7777 {
7878 "operatingsystem" : " Ubuntu" ,
7979 "operatingsystemrelease" : [
80- " 20.04"
80+ " 20.04" ,
81+ " 22.04"
8182 ]
8283 },
8384 {
Original file line number Diff line number Diff line change 11require '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' )
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'
Original file line number Diff line number Diff line change @@ -8,3 +8,9 @@ def unsupported_puppetserver
88 host_inventory [ 'facter' ] [ 'os' ] [ 'release' ] [ 'major' ] == '12'
99 end
1010end
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
You can’t perform that action at this time.
0 commit comments