From 3c8a5203f0a05a3dbfa0cbc72e9c29d87c0daaad Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 7 Aug 2023 17:05:49 +0200
Subject: [PATCH] fix GitHub Actions

---
 .github/workflows/ci.yaml | 32 ++++++++++++++++++--------------
 provision.yaml            | 16 ++--------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d27ea92..8811acc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,35 +13,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        puppet_version: [6,7]
+        puppet_version: [7]
 
     name: Check / Puppet ${{ matrix.puppet_version }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+    container: puppet/pdk:latest
 
     steps:
+      - name: Install build-essential
+        run: |
+          export DEBIAN_FRONTEND=noninteractive;
+          apt-get --yes update
+          apt-get --yes install build-essential
+
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Run pdk validate
-        uses: puppets-epic-show-theatre/action-pdk-validate@v1
-        with:
-          puppet-version: ${{ matrix.puppet_version }}
+        run: pdk validate --format=text --puppet-version ${{ matrix.puppet_version }}
 
       - name: Run pdk test unit
-        uses: puppets-epic-show-theatre/action-pdk-test-unit@v1
-        with:
-          puppet-version: ${{ matrix.puppet_version }}
+        run: pdk test unit --format=text --puppet-version ${{ matrix.puppet_version }}
 
   acceptance:
     strategy:
       fail-fast: false
       matrix:
-        #os: [ 'el7', 'el8', 'el8_stream', 'rocky8', 'alma8', 'el9_stream' 'deb10', 'deb11','ub2004', 'ub2204' ]
-        os: [ 'el8', 'rocky8' ]
-        puppet_version: [6,7]
+        os: ['rocky8', 'ub2204', 'deb11']
+        puppet_version: [7]
 
     name: Acceptance / ${{ matrix.os }} / Puppet ${{ matrix.puppet_version }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - check
 
@@ -50,8 +52,9 @@ jobs:
         run: |
           echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
           sudo service docker restart
+
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -67,6 +70,7 @@ jobs:
           bundle exec rake 'litmus:install_agent[puppet${{ matrix.puppet_version }}]'
           bundle exec rake litmus:install_module
           bundle exec rake litmus:acceptance:parallel
+
       - name: Cleanup
         run: |
           bundle exec rake 'litmus:tear_down'
diff --git a/provision.yaml b/provision.yaml
index 160294b..d4611bd 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -18,7 +18,7 @@ el_all:
   vars: '{docker_run_opts: ["-v /sys/fs/cgroup:/sys/fs/cgroup:ro"]}'
 ub_all:
   provisioner: docker
-  images: ['litmusimage/ubuntu:20.04', 'litmusimage/ubuntu:20.04', 'litmusimage/ubuntu:22.04']
+  images: ['litmusimage/ubuntu:20.04', 'litmusimage/ubuntu:22.04']
 
 gha_deb10:
   provisioner: docker
@@ -39,26 +39,14 @@ gha_el8:
   # The most reliable workaround for the docker/systemd incompatibility.
   # see https://github.com/docker/for-linux/issues/835
   # see https://github.com/moby/moby/issues/38749
-  #vars: '{docker_run_opts: ["-v /sys/fs/cgroup:/sys/fs/cgroup:ro"]}'
-gha_el8_stream:
-  provisioner: docker
-  images: ['litmusimage/centos:stream8']
-gha_el9_stream:
-  provisioner: docker
-  images: ['litmusimage/centos:stream9']
+  vars: '{docker_run_opts: ["-v /sys/fs/cgroup:/sys/fs/cgroup:ro"]}'
 gha_rocky8:
   provisioner: docker
   images: ['litmusimage/rockylinux:8']
-gha_alma8:
-  provisioner: docker
-  images: ['litmusimage/almalinux:8']
   # The most reliable workaround for the docker/systemd incompatibility.
   # see https://github.com/docker/for-linux/issues/835
   # see https://github.com/moby/moby/issues/38749
   #vars: '{docker_run_opts: ["-v /sys/fs/cgroup:/sys/fs/cgroup:ro"]}'
-gha_ub1804:
-  provisioner: docker
-  images: ['litmusimage/ubuntu:18.04']
 gha_ub2004:
   provisioner: docker
   images: ['litmusimage/ubuntu:20.04']