From 36e244f6478edf5a89fdce811efe27092e36ae5c Mon Sep 17 00:00:00 2001
From: akumari <akumari@redhat.com>
Date: Thu, 6 Jun 2024 12:49:17 +0530
Subject: [PATCH 1/2] Add AlmaLinux 8 & 9 support

Added AlmaLinux 8 and 9 to the supported operating systems in metadata.json.

These changes ensure that we start testing with AlmaLinux 8 and 9 instead
of CentOS 8 Stream. This update is part of our transition to better support
AlmaLinux in our Puppet modules.

See, for details: https://github.com/theforeman/foreman-infra/issues/2087

(cherry picked from commit 7a820e4086b8df9d28e417058ca5c9f2d8ffafe4)
---
 metadata.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/metadata.json b/metadata.json
index 0d69aace7..daf5a9525 100644
--- a/metadata.json
+++ b/metadata.json
@@ -77,6 +77,13 @@
       "operatingsystemrelease": [
         "20.04"
       ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
     }
   ]
 }

From 268541df65508688b79d9748d3dda2b56cd24a9a Mon Sep 17 00:00:00 2001
From: akumari <akumari@redhat.com>
Date: Fri, 7 Jun 2024 13:46:10 +0530
Subject: [PATCH 2/2] Update puppet_metadata to ~> 4.0 and voxpupuli-acceptance
 to ~> 3.0

(cherry picked from commit 5f38479c870ef03a4a1565007be68b61e8950d53)
---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index efb9da7f1..5bab0097e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,9 +10,9 @@ gem 'kafo_module_lint', {"groups"=>["test"]}
 gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
 gem 'voxpupuli-test', '~> 7.0', {"groups"=>["test"]}
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
-gem 'puppet_metadata', '~> 3.3'
+gem 'puppet_metadata', '~> 4.0'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 2.0', {"groups"=>["system_tests"]}
+gem 'voxpupuli-acceptance', '~> 3.0', {"groups"=>["system_tests"]}
 gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
 gem 'webmock', '~> 2.0'
 gem 'oauth'