Update gem dependencies and use Puppet 8 by default

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.32.0 / 2023-08-24
+* Added:
+  * Switch to Puppet 8 by default
+* Fixed:
+  * Update gem dependencies
+
 ### 1.31.0 / 2023-07-18
 * Fixed:
   * Compatibility with Ruby 3.2

Gemfile

@@ -13,7 +13,7 @@ gem 'bundler'
 gem 'rake'
 
 group :system_tests do
-  beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 5.0.0'])
+  beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 6.0.0'])
 
   if "#{beaker_gem_options}".include?(':')
     # Just pass in BEAKER_GEM_OPTIONS as a string that would represent the usual
@@ -44,8 +44,8 @@ group :system_tests do
   gem 'beaker-rspec'
   gem 'beaker-windows'
   gem 'net-ssh'
-  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 7.0')
+  gem 'puppet', ENV.fetch('PUPPET_VERSION', ['>= 7.0.0', '< 9.0.0'])
   gem 'rubocop'
   gem 'rubocop-rspec'
-  gem 'puppetlabs_spec_helper', '~> 4.0'
+  gem 'puppetlabs_spec_helper', '>= 4.0.0', '< 7.0.0'
 end

lib/simp/beaker_helpers/constants.rb

@@ -5,7 +5,7 @@ module Simp::BeakerHelpers
   #
   # This is done so that we know if some new thing that we're using breaks the
   # oldest system that we support
-  DEFAULT_PUPPET_AGENT_VERSION = '~> 7.0'
+  DEFAULT_PUPPET_AGENT_VERSION = '~> 8.0'
 
   SSG_REPO_URL = ENV['BEAKER_ssg_repo'] || 'https://github.com/ComplianceAsCode/content.git'
 

lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.31.0'
+  VERSION = '1.32.0'
 end

simp-beaker-helpers.gemspec

@@ -16,19 +16,19 @@ Gem::Specification.new do |s|
   s.email       = '[email protected]'
   s.homepage    = 'https://github.com/simp/rubygem-simp-beaker-helpers'
   s.metadata = {
-                 'issue_tracker' => 'https://simp-project.atlassian.net'
+                 'issue_tracker' => 'https://github.com/simp/rubygem-simp-beaker-helpers/issues'
                }
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_runtime_dependency 'beaker'                      , ['>= 4.17.0', '< 6.0.0']
-  s.add_runtime_dependency 'beaker-rspec'                , '~> 8.0'
-  s.add_runtime_dependency 'beaker-puppet'               , ['>= 1.18.14', '< 2.0.0']
-  s.add_runtime_dependency 'beaker-docker'               , ['>= 0.8.3', '< 2.0.0']
-  s.add_runtime_dependency 'docker-api'                  , ['>= 2.1.0', '< 3.0.0']
-  s.add_runtime_dependency 'beaker-vagrant'              , ['>= 0.6.4', '< 2.0.0']
-  s.add_runtime_dependency 'highline'                    , '~> 2.0'
-  s.add_runtime_dependency 'nokogiri'                    , '~> 1.8'
+  s.add_runtime_dependency 'beaker',         ['>= 4.17.0', '< 6.0.0']
+  s.add_runtime_dependency 'beaker-rspec',   '~> 8.0'
+  s.add_runtime_dependency 'beaker-puppet',  ['>= 1.18.14', '< 3.0.0']
+  s.add_runtime_dependency 'beaker-docker',  ['>= 0.8.3', '< 3.0.0']
+  s.add_runtime_dependency 'docker-api',     ['>= 2.1.0', '< 3.0.0']
+  s.add_runtime_dependency 'beaker-vagrant', ['>= 0.6.4', '< 2.0.0']
+  s.add_runtime_dependency 'highline',       '~> 2.0'
+  s.add_runtime_dependency 'nokogiri',       '~> 1.8'
 
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
   s.files       = `git ls-files`.split("\n")

spec/acceptance/nodesets/amzn2.yml

@@ -1,22 +1,14 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   amzn2:
     roles:
       - default
     platform: el-7-x86_64
     box: gbailey/amzn2
-    hypervisor: <%= hypervisor %>
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
 
 CONFIG:
   log_level: verbose
-  synced_folder : disabled
+  synced_folder: disabled
   type: aio
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

spec/acceptance/nodesets/default.yml

@@ -2,18 +2,18 @@
 HOSTS:
   el7:
     roles:
-    - default
-    - el7
+      - default
+      - el7
     platform: el-7-x86_64
     box: centos/7
     hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
     family: centos-cloud/centos-7
     gce_machine_type: n1-standard-2
   el8:
     roles:
-    - el8
+      - el8
     platform: el-8-x86_64
-    box: centos/stream8
+    box: generic/centos8s
     hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
     family: centos-cloud/centos-stream-8
     gce_machine_type: n1-standard-2
@@ -33,4 +33,4 @@ CONFIG:
       - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
     hmac:
       - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"

spec/acceptance/nodesets/docker.yml

@@ -1,27 +1,26 @@
+---
 HOSTS:
   el7.test.net:
     roles:
       - default
       - el7
-    platform:   el-7-x86_64
+    platform: el-7-x86_64
     hypervisor: docker
     image: simpproject/simp_beaker_el7
-    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
+    docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
 
   el8.test.net:
     roles:
       - el8
-    platform:   el-8-x86_64
+    platform: el-8-x86_64
     hypervisor: docker
     image: simpproject/simp_beaker_el8
-    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
+    docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
 
 CONFIG:
   log_level: verbose
   type: aio
-<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
-  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
   ssh:
     password: root
     auth_methods:

spec/acceptance/nodesets/oel.yml

@@ -1,33 +1,25 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   oel7:
     roles:
       - default
       - el7
     platform: el-7-x86_64
     box: generic/oracle7
-    hypervisor: <%= hypervisor %>
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
 
   oel8:
     roles:
       - el8
     platform: el-8-x86_64
     box: generic/oracle8
-    hypervisor: <%= hypervisor %>
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
 
 CONFIG:
   log_level: verbose
   type: aio
   vagrant_cpus: 2
-<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
-  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
   ssh:
     keepalive: true
     keepalive_interval: 10

spec/acceptance/nodesets/ubuntu.yml

@@ -2,7 +2,7 @@
 HOSTS:
   focal:
     roles:
-    - default
+      - default
     platform: ubuntu-20.04-x86_64
     box: ubuntu/focal64
     hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
@@ -11,4 +11,4 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"