From 7a9102c568d5a6f990eac769342e4d8349a102a7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 28 Apr 2026 20:12:59 +0000
Subject: [PATCH 1/3] Update dependency puppet_metadata to v6

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 352d31e..9bd710a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
   gem 'voxpupuli-test', '~> 14.0',              :require => false
-  gem 'puppet_metadata', '~> 5.0',              :require => false
+  gem 'puppet_metadata', '~> 6.0',              :require => false
   gem 'puppet-lint-package_ensure-check',       :require => false
   gem 'puppet-lint-resource_reference_syntax',  :require => false
   gem 'puppet-lint-strict_indent-check',        :require => false

From dc581a6bf6268969818a0fe603a5d58d1529c6de Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@stanford.edu>
Date: Tue, 28 Apr 2026 13:17:44 -0700
Subject: [PATCH 2/3] ci: update beaker.yml to v4

v3 uses --pidfile-workaround which no longer exists in puppet_metadata v6
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4467415..4bf6996 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,4 +22,4 @@ permissions:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4

From e7dd488d742260f17fc8596995d4ea45947e8f53 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@stanford.edu>
Date: Tue, 28 Apr 2026 15:05:41 -0700
Subject: [PATCH 3/3] ci: switch back to docker

In beaker.yml v4, the default changed to 'container_podman'.
This has issues with starting the dsid.service:
  Failed to set up CPU scheduling: Operation not permitted
  Failed at step SETSCHEDULER spawning
   /opt/lsst/daq-sdk/current/x86/bin/dsid_startup:
   Operation not permitted
---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4bf6996..f81e6ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,3 +23,5 @@ jobs:
   puppet:
     name: Puppet
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4
+    with:
+      beaker_hypervisor: 'docker'