From 6133f872c996adfd421a9b3129f8234d0ef19c3c Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Fri, 3 Nov 2023 09:14:14 +0100
Subject: [PATCH] Add Ubuntu 22.04 support

---
 metadata.json                                |  3 ++-
 spec/acceptance/puppetserver_upgrade_spec.rb | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/metadata.json b/metadata.json
index 0cdfa3f1..e84025a6 100644
--- 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
index bcdfa836..1a1256f4 100644
--- a/spec/acceptance/puppetserver_upgrade_spec.rb
+++ b/spec/acceptance/puppetserver_upgrade_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper_acceptance'
 
-unless unsupported_puppetserver
+unless unsupported_puppetserver ||
+    (fact('os.family') == 'RedHat' && fact('os.release.major') == '9') ||
+    (fact('os.name') == 'Ubuntu' && fact('os.release.major') == '22.04')
   describe 'Scenario: minor version upgrade' do
     before(:all) do
       if check_for_package(default, 'puppetserver')
@@ -16,12 +18,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'