From 736dbd780988b6eb3530d96ac8404aa58ec877ad Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Mon, 3 Jun 2024 10:52:00 +0200
Subject: [PATCH 1/2] Switch to Ubuntu 24.04 for CI

This switches the default OS for CI jobs from ubuntu-latest (currently
22.04) to 24.04. Except for the beaker jobs, they still run with 20.04
becauser newer systems don't support EL7. We will change that later.
---
 .github/workflows/basic.yml   | 6 +++---
 .github/workflows/beaker.yml  | 6 +++---
 .github/workflows/release.yml | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index cac84ab..b563f5e 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -31,7 +31,7 @@ on:
         type: string
       unit_runs_on:
         description: the runner group used for unit jobs run on
-        default: ubuntu-latest
+        default: ubuntu-24.04
         required: false
         type: string
 
@@ -41,7 +41,7 @@ jobs:
       run:
         working-directory: ${{ inputs.working-directory }}
     name: Static validations
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: ${{ inputs.timeout_minutes }}
     outputs:
       puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
@@ -102,7 +102,7 @@ jobs:
 
   tests:
     needs: unit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Test suite
     steps:
       - run: echo Test suite completed
diff --git a/.github/workflows/beaker.yml b/.github/workflows/beaker.yml
index c916b85..5f3afca 100644
--- a/.github/workflows/beaker.yml
+++ b/.github/workflows/beaker.yml
@@ -56,7 +56,7 @@ on:
         type: string
       unit_runs_on:
         description: the runner group used for unit jobs run on
-        default: ubuntu-latest
+        default: ubuntu-24.04
         required: false
         type: string
       acceptance_runs_on:
@@ -78,7 +78,7 @@ jobs:
       run:
         working-directory: ${{ inputs.working-directory }}
     name: Static validations
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: ${{ inputs.timeout_minutes }}
     outputs:
       puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
@@ -183,7 +183,7 @@ jobs:
     needs:
       - unit
       - acceptance
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Test suite
     steps:
       - run: echo Test suite completed
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 771a888..d0e757f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       run:
         working-directory: ${{ inputs.working-directory }}
     name: 'Puppet Forge'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: github.repository_owner == inputs.allowed_owner
     steps:
       - name: Checkout repository

From 404d98ee3c098d9542f659055d730bd219b3010b Mon Sep 17 00:00:00 2001
From: Dan Berkowitz <dansberkowitz@gmail.com>
Date: Tue, 18 Jun 2024 15:38:19 -0400
Subject: [PATCH 2/2] Update beaker.yml

Update acceptance tests to run on 24.04
---
 .github/workflows/beaker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/beaker.yml b/.github/workflows/beaker.yml
index 5f3afca..489dddd 100644
--- a/.github/workflows/beaker.yml
+++ b/.github/workflows/beaker.yml
@@ -61,7 +61,7 @@ on:
         type: string
       acceptance_runs_on:
         description: the runner group used for acceptance jobs run on
-        default: ubuntu-20.04
+        default: ubuntu-24.04
         required: false
         type: string
     secrets: