Skip to content

Commit 3a8f34b

Browse files
committed
Remove pidfile_workaround and instead use unsupported_puppetserver
This at least tests the agent on EL8.
1 parent fc17282 commit 3a8f34b

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ jobs:
1414
name: Puppet
1515
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
1616
with:
17-
pidfile_workaround: 'true'
1817
rubocop: false
1918
cache-version: '1'

.sync.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
.github/workflows/ci.yml:
3-
pidfile_workaround: true
42
Gemfile:
53
extra:
64
- gem: hocon

spec/support/acceptance/puppetserver.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ def unsupported_puppetserver
66
when 'Debian'
77
os['name'] == 'Debian' && os['release']['major'] == '12'
88
when 'RedHat'
9-
os['name'] == 'Fedora'
9+
# puppetserver uses PIDFile, which breaks on Docker
10+
os['name'] == 'Fedora' || (default[:hypervisor] == 'docker' && os['release']['major'] == '8')
1011
end
1112
end
1213

0 commit comments

Comments
 (0)