From 49022c60d7717b015628901521d70a770ea9c6ca Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Thu, 4 Aug 2022 11:28:40 +0100
Subject: [PATCH 1/4] (GH-cat-11) Certify Support for Ubuntu 22.04

---
 metadata.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 9c2d514f..9c3ba2d6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -36,7 +36,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     },
     {

From 0a34d8686cb84acb4ab13cde44a6c8b285cc4d7c Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 16 Aug 2022 15:32:39 +0100
Subject: [PATCH 2/4] Update ubuntu workflow

---
 .github/workflows/ubuntu18_pr.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ubuntu18_pr.yaml b/.github/workflows/ubuntu18_pr.yaml
index 1d57ef98..90fb38c7 100644
--- a/.github/workflows/ubuntu18_pr.yaml
+++ b/.github/workflows/ubuntu18_pr.yaml
@@ -10,6 +10,7 @@ jobs:
         platform:
           - ubuntu-18.04
           - ubuntu-20.04
+          - ubuntu-22.04
         collection:
           - puppet6-nightly
           - puppet7-nightly

From 297577f44fde2e19a9f43c27802b88a88225161b Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Tue, 16 Aug 2022 15:40:19 +0100
Subject: [PATCH 3/4] (maint) swap from 'actions/setup-ruby ' to
 'ruby/setup-ruby'

---
 .github/workflows/ubuntu18_pr.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ubuntu18_pr.yaml b/.github/workflows/ubuntu18_pr.yaml
index 90fb38c7..4037367a 100644
--- a/.github/workflows/ubuntu18_pr.yaml
+++ b/.github/workflows/ubuntu18_pr.yaml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Activate Ruby 2.7
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: "2.7"
 

From ee75c7c5facf2e73623a651bf64bc4f7efe082ef Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 17 Aug 2022 10:08:26 +0100
Subject: [PATCH 4/4] (maint) Rename workflow for clarity + add new nightly
 ubuntu workflow

---
 .github/workflows/nightly_ubuntu.yaml         | 66 +++++++++++++++++++
 .../{ubuntu18_pr.yaml => pr_test_ubuntu.yaml} |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/nightly_ubuntu.yaml
 rename .github/workflows/{ubuntu18_pr.yaml => pr_test_ubuntu.yaml} (97%)

diff --git a/.github/workflows/nightly_ubuntu.yaml b/.github/workflows/nightly_ubuntu.yaml
new file mode 100644
index 00000000..324c2397
--- /dev/null
+++ b/.github/workflows/nightly_ubuntu.yaml
@@ -0,0 +1,66 @@
+name: "Nightly Test on Ubuntu Github Runners"
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  Acceptance:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - ubuntu-18.04
+          - ubuntu-20.04
+          - ubuntu-22.04
+        collection:
+          - puppet6-nightly
+          - puppet7-nightly
+
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v2
+
+      - name: Activate Ruby 2.7
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7"
+
+      - name: Cache gems
+        uses: actions/cache@v2
+        with:
+          path: vendor/gems
+          key: ${{ runner.os }}-pr-${{ hashFiles('**/Gemfile') }}
+          restore-keys: |
+            ${{ runner.os }}-pr-
+            ${{ runner.os }}-
+
+      - name: Prepare inventory file
+        run: |
+          cat <<EOF >> spec/fixtures/litmus_inventory.yaml
+          ---
+          version: 2
+          groups:
+          - name: local
+            targets:
+            - uri: litmus_localhost
+              config:
+                transport: local
+          - name: ssh_nodes
+            targets: []
+          - name: winrm_nodes
+            targets: []
+          EOF
+
+      - name: Install gems and puppet agent
+        run: |
+          bundle install
+          sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+
+      - name: Install module
+        run: bundle exec rake 'litmus:install_module'
+
+      - name: Run acceptance tests
+        run: sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:acceptance:localhost'
diff --git a/.github/workflows/ubuntu18_pr.yaml b/.github/workflows/pr_test_ubuntu.yaml
similarity index 97%
rename from .github/workflows/ubuntu18_pr.yaml
rename to .github/workflows/pr_test_ubuntu.yaml
index 4037367a..9cdbaa36 100644
--- a/.github/workflows/ubuntu18_pr.yaml
+++ b/.github/workflows/pr_test_ubuntu.yaml
@@ -1,4 +1,4 @@
-name: "Test on Ubuntu Github Runners"
+name: "PR Test on Ubuntu Github Runners"
 
 on: [pull_request]