From a5888cb5a036ca9481eac1f12d5d643dcd9762ec Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Tue, 5 Oct 2021 16:24:12 +0100
Subject: [PATCH 1/3] (IAC-1752) - Add Support for AlmaLinux 8

---
 metadata.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/metadata.json b/metadata.json
index b61964bc96..ab4b5dffc2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -81,6 +81,12 @@
       "operatingsystemrelease": [
         "8"
       ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8"
+      ]
     }
   ],
   "requirements": [

From 33124bb22b57b4a74bcf0993853e18d4c0c0b64a Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 3 Nov 2021 14:03:40 +0000
Subject: [PATCH 2/3] (IAC-1775) Update workflows

---
 .github/workflows/nightly_non_rhel.yml | 2 +-
 .github/workflows/pr_test_non_rhel.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly_non_rhel.yml b/.github/workflows/nightly_non_rhel.yml
index 5e1c88ece1..dc21aa867d 100644
--- a/.github/workflows/nightly_non_rhel.yml
+++ b/.github/workflows/nightly_non_rhel.yml
@@ -58,7 +58,7 @@ jobs:
       if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["RedHat-6", "RedHat-7", "RedHat-8", "CentOS-6", "CentOS-7", "CentOS-8", "OracleLinux-6", "OracleLinux-7", "Rocky-8"]'
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["RedHat-6", "RedHat-7", "RedHat-8", "CentOS-6", "CentOS-7", "CentOS-8", "OracleLinux-6", "OracleLinux-7", "Rocky-8", "AlmaLinux-8"]'
         else
           echo  "::set-output name=matrix::{}"
         fi
diff --git a/.github/workflows/pr_test_non_rhel.yml b/.github/workflows/pr_test_non_rhel.yml
index 78dbe5edbc..31dc5b50fa 100644
--- a/.github/workflows/pr_test_non_rhel.yml
+++ b/.github/workflows/pr_test_non_rhel.yml
@@ -61,7 +61,7 @@ jobs:
       id: get-matrix
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["RedHat-6", "RedHat-7", "RedHat-8", "CentOS-6", "CentOS-7", "CentOS-8", "OracleLinux-6", "OracleLinux-7", "Rocky-8"]'
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["RedHat-6", "RedHat-7", "RedHat-8", "CentOS-6", "CentOS-7", "CentOS-8", "OracleLinux-6", "OracleLinux-7", "Rocky-8", "AlmaLinux-8"]'
         else
           echo  "::set-output name=matrix::{}"
         fi

From f9f4357bc7aed454404e3299835c8bb44e02240f Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 3 Nov 2021 16:43:29 +0000
Subject: [PATCH 3/3] (IAC-1775) Updates test setup

---
 spec/spec_helper_acceptance_local.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 9dc7bcebaf..b0e8f5062f 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -15,6 +15,10 @@ def unindent
 
 RSpec.configure do |c|
   c.before :suite do
+    # Install iproute on AlmaLinux
+    # Package is used to check if ports are listening
+    LitmusHelper.instance.run_shell('sudo dnf install iproute -y') if %r{redhat}.match?(os[:family]) && os[:release].to_f >= 8
+
     install_dependencies
   end
 end