Update from voxpupuli modulesync_config 6.0.0

.fixtures.yml

@@ -7,3 +7,8 @@ fixtures:
     vcsrepo: "puppetlabs/vcsrepo"
     systemd: "puppet/systemd"
     sudo: "saz/sudo"
+    # acceptance test only
+    accounts: "puppetlabs/accounts"
+    alternatives: "puppet/alternatives"
+    java_artisanal: "lsst/java_artisanal"
+    yum: "puppet/yum"

.github/workflows/ci.yml

@@ -4,7 +4,7 @@
 
 name: CI
 
-on: pull_request
+"on": pull_request
 
 concurrency:
   group: ${{ github.ref_name }}

.github/workflows/release.yml

@@ -4,7 +4,7 @@
 
 name: Release
 
-on:
+"on":
   push:
     tags:
       - '*'

.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'

.sync.yml

@@ -1,31 +1,26 @@
 ---
-.puppet-lint.rc:
+".puppet-lint.rc":
   enabled_lint_checks:
-    - parameter_documentation
-    - parameter_types
-
+  - parameter_documentation
+  - parameter_types
 spec/spec_helper_acceptance.rb:
   unmanaged: false
-
-.github/CONTRIBUTING.md:
+  configure_beaker: ~
+".github/CONTRIBUTING.md":
   delete: true
-.github/ISSUE_TEMPLATE.md:
+".github/ISSUE_TEMPLATE.md":
   delete: true
-.github/PULL_REQUEST_TEMPLATE.md:
+".github/PULL_REQUEST_TEMPLATE.md":
   delete: true
-.github/SECURITY.md:
+".github/SECURITY.md":
   delete: true
-
 Gemfile:
   optional:
-    ':test':
-      - gem: puppet-lint-legacy_facts-check
-      - gem: puppet-lint-no_erb_template-check
-      - gem: puppet-lint-package_ensure-check
-      - gem: puppet-lint-resource_reference_syntax
-      - gem: puppet-lint-strict_indent-check
-      - gem: puppet-lint-template_file_extension-check
-      - gem: puppet-lint-top_scope_facts-check
-      - gem: puppet-lint-trailing_newline-check
-      - gem: puppet-lint-unquoted_string-check
-      - gem: puppet-lint-variable_contains_upcase
+    ":test":
+    - gem: puppet-lint-package_ensure-check
+    - gem: puppet-lint-resource_reference_syntax
+    - gem: puppet-lint-strict_indent-check
+    - gem: puppet-lint-unquoted_string-check
+    - gem: puppet-lint-variable_contains_upcase
+    ":system_tests":
+    - gem: puppetlabs_spec_helper

Gemfile

@@ -4,20 +4,15 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',                   :require => false
-  gem 'coveralls',                                  :require => false
-  gem 'simplecov-console',                          :require => false
-  gem 'puppet_metadata', '~> 2.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
-  gem 'puppet-lint-resource_reference_syntax',      :require => false
-  gem 'puppet-lint-strict_indent-check',            :require => false
-  gem 'puppet-lint-template_file_extension-check',  :require => false
-  gem 'puppet-lint-top_scope_facts-check',          :require => false
-  gem 'puppet-lint-trailing_newline-check',         :require => false
-  gem 'puppet-lint-unquoted_string-check',          :require => false
-  gem 'puppet-lint-variable_contains_upcase',       :require => false
+  gem 'voxpupuli-test', '~> 6.0',               :require => false
+  gem 'coveralls',                              :require => false
+  gem 'simplecov-console',                      :require => false
+  gem 'puppet_metadata', '~> 3.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
+  gem 'puppet-lint-unquoted_string-check',      :require => false
+  gem 'puppet-lint-variable_contains_upcase',   :require => false
 end
 
 group :development do
@@ -26,18 +21,20 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
+  gem 'puppetlabs_spec_helper',          :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

rakelib/beaker.rake

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+task beaker: 'spec_prep'
+
+# vim: syntax=ruby

spec/spec_helper_acceptance.rb

@@ -5,6 +5,4 @@
 
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-configure_beaker
-
 Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }

spec/support/acceptance/setup.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-configure_beaker do |host|
-  install_module_from_forge_on(host, 'puppetlabs/accounts', '> 7 < 8')
-  install_module_from_forge_on(host, 'lsst/java_artisanal', '>= 2.4.0')
-  install_module_from_forge_on(host, 'puppet/alternatives', '>= 4.1.0')
+configure_beaker(modules: :fixtures) do |host|
   scp_to(host, "#{__dir__}/../../fixtures/facts/site.yaml", '/opt/puppetlabs/facter/facts.d/site.yaml')
-  # XXX this is a kludge!  We need to overwrite the first automatic
-  # installation of the dev module as the `log` dir is being filtered out.
-  install_module(ignore_list: ['.bundle', 'bundle', '.vendor', 'vendor'])
 end