Remove pidfile_workaround and instead use unsupported_puppetserver

This at least tests the agent on EL8.
theforeman · Mar 23, 2024 · 3a8f34b · 3a8f34b
1 parent fc17282
commit 3a8f34b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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