Add Ubuntu 22.04 support

theforeman · Nov 6, 2023 · 1b5caa9 · 1b5caa9
1 parent b48699c
commit 1b5caa9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/metadata.json b/metadata.json
@@ -77,7 +77,8 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     },
     {

diff --git a/spec/acceptance/puppetserver_upgrade_spec.rb b/spec/acceptance/puppetserver_upgrade_spec.rb
@@ -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')
@@ -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'

diff --git a/spec/support/acceptance/puppetserver.rb b/spec/support/acceptance/puppetserver.rb
@@ -8,3 +8,8 @@ def unsupported_puppetserver
     host_inventory['facter']['os']['release']['major'] == '12'
   end
 end
+
+def unsupported_puppetserver_upgrade
+  (fact('os.family') == 'RedHat' && fact('os.release.major') == '9') ||
+    (fact('os.name') == 'Ubuntu' && fact('os.release.major') == '22.04')
+end