From 3a8f34b9aeb56d0546f8392b5ae0b662f2a4a9db Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 22 Mar 2024 18:18:54 +0100
Subject: [PATCH] Remove pidfile_workaround and instead use
 unsupported_puppetserver

This at least tests the agent on EL8.
---
 .github/workflows/ci.yml                | 1 -
 .sync.yml                               | 2 --
 spec/support/acceptance/puppetserver.rb | 3 ++-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1f03a29..268f89de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,5 @@ jobs:
     name: Puppet
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
-      pidfile_workaround: 'true'
       rubocop: false
       cache-version: '1'
diff --git a/.sync.yml b/.sync.yml
index f7471265..c23206d3 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,6 +1,4 @@
 ---
-.github/workflows/ci.yml:
-  pidfile_workaround: true
 Gemfile:
   extra:
     - gem: hocon
diff --git a/spec/support/acceptance/puppetserver.rb b/spec/support/acceptance/puppetserver.rb
index eed4bdc0..450a03bc 100644
--- a/spec/support/acceptance/puppetserver.rb
+++ b/spec/support/acceptance/puppetserver.rb
@@ -6,7 +6,8 @@ def unsupported_puppetserver
   when 'Debian'
     os['name'] == 'Debian' && os['release']['major'] == '12'
   when 'RedHat'
-    os['name'] == 'Fedora'
+    # puppetserver uses PIDFile, which breaks on Docker
+    os['name'] == 'Fedora' || (default[:hypervisor] == 'docker' && os['release']['major'] == '8')
   end
 end