From 6bdd1bc128af70ccfd6a05d336c3444b8e5782f7 Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <josh@hoblitt.com>
Date: Thu, 6 Jul 2023 15:11:34 -0700
Subject: [PATCH] Update from voxpupuli modulesync_config 5.3.0

---
 .github/workflows/ci.yml         |  2 +-
 .github/workflows/pr_labels.yaml | 14 ++++++++++++++
 .github/workflows/release.yml    |  2 +-
 .msync.yml                       |  2 +-
 Dockerfile                       | 24 ------------------------
 Gemfile                          | 13 +++++++------
 spec/spec_helper.rb              |  1 +
 spec/spec_helper_acceptance.rb   |  2 +-
 8 files changed, 26 insertions(+), 34 deletions(-)
 create mode 100644 .github/workflows/pr_labels.yaml
 delete mode 100644 Dockerfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a07791..76bc72f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@
 
 name: CI
 
-on: pull_request
+"on": pull_request
 
 concurrency:
   group: ${{ github.ref_name }}
diff --git a/.github/workflows/pr_labels.yaml b/.github/workflows/pr_labels.yaml
new file mode 100644
index 0000000..ea85205
--- /dev/null
+++ b/.github/workflows/pr_labels.yaml
@@ -0,0 +1,14 @@
+---
+name: "Pull Request Labels"
+"on":
+  pull_request:
+    types: ["opened", "labeled", "unlabeled", "synchronize"]
+jobs:
+  label:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "mheap/github-action-required-labels@v3"
+        with:
+          mode: "exactly"
+          count: 1
+          labels: "enhancement, bug, skip-changelog"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f0ced0f..3a4f35d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,7 @@
 
 name: Release
 
-on:
+"on":
   push:
     tags:
       - '*'
diff --git a/.msync.yml b/.msync.yml
index a4b0069..b929160 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '5.5.0'
+modulesync_config_version: '6.0.0'
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 8dd82d6..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# MANAGED BY MODULESYNC
-# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
-
-FROM ruby:2.7
-
-WORKDIR /opt/puppet
-
-# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
-RUN mkdir -p /etc/sv
-
-ARG PUPPET_GEM_VERSION="~> 6.0"
-ARG PARALLEL_TEST_PROCESSORS=4
-
-# Cache gems
-COPY Gemfile .
-RUN bundle install --without system_tests development release --path=${BUNDLE_PATH:-vendor/bundle}
-
-COPY . .
-
-RUN bundle install
-RUN bundle exec rake release_checks
-
-# Container should not saved
-RUN exit 1
diff --git a/Gemfile b/Gemfile
index 9389f45..cf9509b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',                   :require => false
+  gem 'voxpupuli-test', '~> 6.0',                   :require => false
   gem 'coveralls',                                  :require => false
   gem 'simplecov-console',                          :require => false
-  gem 'puppet_metadata', '~> 2.0',                  :require => false
+  gem 'puppet_metadata', '~> 3.0',                  :require => false
   gem 'puppet-lint-legacy_facts-check',             :require => false
   gem 'puppet-lint-no_erb_template-check',          :require => false
   gem 'puppet-lint-package_ensure-check',           :require => false
@@ -26,18 +26,19 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
-  gem 'voxpupuli-release', '~> 2.0',              :require => false
+  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
+  gem 'voxpupuli-release', '~> 3.0',              :require => false
+  gem 'faraday-retry', '~> 2.1',                  :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6515b7b..9efb4ae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,3 +17,4 @@
     add_custom_fact name.to_sym, value
   end
 end
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index d3a6e23..2681792 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -5,6 +5,6 @@
 
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-configure_beaker
+configure_beaker(modules: :metadata)
 
 Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }