simp-beaker-helpers 1.31.0 → 1.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f45055d8c6080e06fd0c7b6e4ebe9d7dc9653a811f438f922313b22ff1bc1678
-  data.tar.gz: 0725f20181c9a5ff343642c4594427e91e89ba0b3274acd7be3f2c99c3afc5e2
+  metadata.gz: 70e9681a104843ffcf65bea30bf68889f95e6b98123ce84405f13b8f0ec5e5a3
+  data.tar.gz: 3aba81fbf4114f732d95fa02c17183fae8700526bf3283adef836efaaa5872e5
 SHA512:
-  metadata.gz: e2bca2260f68d5852c9add0b8e2b417a57d2c77609509a8d0389bd0dbfaddfaff4c92aacc63df6b8d03c2c6ac63ec4616d3f39726ba1303b44c123a2e20f11cf
-  data.tar.gz: 559dae19ae5be41c366ef9fde7fdfeb811bff6ad73751a00d1dac2aed0c76a3b34fa5c80cd949e1ff796f1341f488480da5b8a0afb3b5cb2e56097fb25f0bcc8
+  metadata.gz: 26b94424a383237f5d7ed0b369e9fc29be8b5c23490c6c6667fdabedf34f4098e8aae6a45ce0f4f9ef72ef1316a64e35d33d1ef8b15c6c4e728dbf5cf8efb22c
+  data.tar.gz: fcb649d0c8ee056365c8ee3b789e2fdc522882e4a70ace33249a8098e46e3784a50891ddc1def701c6b522599d37e4c1585c6ca14b7b6379aff65102a299cf6a

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 1.32.1 / 2023-08-28
+* Fixed:
+  * Version bump to resolve mis-tagging
+
+### 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

data/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

data/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'
 

data/lib/simp/beaker_helpers/version.rb

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

data/simp-beaker-helpers.gemspec

@@ -16,19 +16,19 @@ Gem::Specification.new do |s|
   s.email       = 'simp@simp-project.org'
   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")

data/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') %>"

data/spec/acceptance/nodesets/default.yml

@@ -2,8 +2,8 @@
 HOSTS:
   el7:
     roles:
-    - default
-    - el7
+      - default
+      - el7
     platform: el-7-x86_64
     box: centos/7
     hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
@@ -11,9 +11,9 @@ HOSTS:
     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') %>"

data/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:

data/spec/acceptance/nodesets/oel.yml

@@ -1,10 +1,4 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   oel7:
     roles:
@@ -12,22 +6,20 @@ HOSTS:
       - 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

data/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') %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.32.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -54,7 +54,7 @@ dependencies:
         version: 1.18.14
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
         version: 1.18.14
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-docker
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
         version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ homepage: https://github.com/simp/rubygem-simp-beaker-helpers
 licenses:
 - Apache-2.0
 metadata:
-  issue_tracker: https://simp-project.atlassian.net
+  issue_tracker: https://github.com/simp/rubygem-simp-beaker-helpers/issues
 post_install_message: 
 rdoc_options: []
 require_paths: