simp-beaker-helpers 1.24.4 → 1.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea59f88fb5dfa33fe812b52e53dfb71ff10e104f9eb720cd4f233974478ba6dc
-  data.tar.gz: 39ef7ef09f672407964dfb2e06302131583864a50ed9fd89ec71238ff1f86ee6
+  metadata.gz: 1a861935f1cb30047688354b52fe5208622c767e05de0637149e6b4042b28d0a
+  data.tar.gz: 834f97957b17b804aad1a9320944c4229b5c2bcd8eccc0f2dd1373b31841f0d9
 SHA512:
-  metadata.gz: bc4ab204f1df2a4a141951d87df4677f449830394d315015079b324c028a7eafe8b32f12a03384b1bc9c01effb8bb5a4cc8e9998349c0bc3f4f9a80c50283d9a
-  data.tar.gz: e6a63e7e5175abf091cdb7694be5dd889263a3e2fbfd908657d24367199a79c31faa44a5d9b1eb3964534ffe7a64f50f366dc151cdd250548aec7ebc67c2590a
+  metadata.gz: fb60e2fa1a182349fa7fcc03e71d7615952400aa6d806d1db0c4b96fdf97a333a8717ddd25b39f61134fba230190c98f707be854be7b5a3edc56fcdb9f4986e9
+  data.tar.gz: '089f9e55f5d55fedd54024c83ef828e05efe9c9e21dc81087abdfb139f748643ab3b836b7eade7649ac348e56b1d3cfb3abfb68252d8a571393054479b3bb4d6'

data/.github/workflows/tag_deploy_rubygem.yml

@@ -1,4 +1,4 @@
-# When SemVer tag is pushed: create GitHub release & publish gem to rubygems.org
+# Create GitHub release, build & publish .gem to rubygems.org on SemVer tag push
 #
 # This workflow's jobs are only triggered in repos under the `simp` organization
 # ------------------------------------------------------------------------------
@@ -56,6 +56,10 @@ jobs:
     name: "RELENG checks"
     if: github.repository_owner == 'simp'
     runs-on: ubuntu-latest
+    outputs:
+      build_command: ${{ steps.commands.outputs.build_command }}
+      release_command: ${{ steps.commands.outputs.release_command }}
+      pkg_dir: ${{ steps.commands.outputs.pkg_dir }}
     steps:
       - name: "Assert '${{ github.ref }}' is a tag"
         run: '[[ "$GITHUB_REF" =~ ^refs/tags/ ]] || { echo "::error ::GITHUB_REF is not a tag: ${GITHUB_REF}"; exit 1 ; }'
@@ -66,8 +70,8 @@ jobs:
       - name: Determine build and release commands
         id: commands
         run: |
-          # By default, these are the standard tasks from "bundler/gem_tasks"
-          # To override them in the LOCAL_WORKFLOW_CONFIG_FILE
+          # By default, this is the standard task from "bundler/gem_tasks"
+          # To override it, add the new command to LOCAL_WORKFLOW_CONFIG_FILE
           GEM_BUILD_COMMAND='bundle exec rake build'
           GEM_RELEASE_COMMAND='bundle exec rake build release:rubygem_push'
           GEM_PKG_DIR='pkg'

data/.gitignore

@@ -1,9 +1,24 @@
+.*.sw?
+.yardoc
+.idea/
 .fips_fixtures.yml
 *.gem
-*.swp
-Gemfile.lock
-.bundle/
 *.old
 .vagrant
+dist
+/pkg
+# Read everything in fixtures
+/spec/fixtures/*
+# Un-ignore hieradata
+!/spec/fixtures/hieradata/*
+# Except this one, which is auto-generated
+/spec/fixtures/hieradata/hiera.yaml
+/spec/rp_env
+/.rspec_system
+/.vagrant
+/.bundle
+/.vendor
+/vendor
+/junit
 /log
-/spec/fixtures
+/doc

data/.gitlab-ci.yml

@@ -313,6 +313,12 @@ default:
   script:
     - bundle exec rake beaker:suites[default]
 
+default-amzn2:
+  <<: *pup_6_x
+  <<: *acceptance_base
+  script:
+    - bundle exec rake beaker:suites[default,amzn2]
+
 default-fips:
   <<: *pup_6_x
   <<: *acceptance_base

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+### 1.26.2 / 2022-07-26
+* Fixed:
+  * Limit the length of the CN field of the certificates to 64 bytes
+
+### 1.26.1 / 2022-06-24
+* Fixed:
+  * Ensure that `multi_node` is enabled by default for backwards compatibility
+  * Sort the discovered nodesets by default when running with `ALL` nodesets
+
+### 1.26.0 / 2022-06-24
+* Added:
+  * Allow for sequential nodesets by setting `multi_node: false` in the
+    `CONFIG:` section of your nodeset.
+
+### 1.25.0 / 2022-06-11
+* Fixed:
+  * Replaced calls to `sed -c` with something POSIX compliant that should work
+    on non-RHEL systems
+* Added:
+  * Updated all dependencies to their latest versions where possible and removed
+    depdendencies on deprecated libraries.
+
+### 1.24.5 / 2022-05-06
+* Fixed:
+  * Added a workaround for Amazon Linux 2 testing
+
 ### 1.24.4 / 2022-04-28
 * Fixed:
   * Workaround for [MODULES-11315] in `puppet-agent-versions.yaml`

data/Gemfile

@@ -44,8 +44,8 @@ group :system_tests do
   gem 'beaker-rspec'
   gem 'beaker-windows'
   gem 'net-ssh'
-  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 6.0')
-  gem 'puppetlabs_spec_helper', '~> 3.0'
+  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 7.0')
   gem 'rubocop'
   gem 'rubocop-rspec'
+  gem 'puppetlabs_spec_helper', '~> 4.0'
 end

data/files/pki/make.sh

@@ -46,7 +46,7 @@ for hosts in $*; do
   echo "-- $hname"
   mkdir -p "${keydist}/${hname}/cacerts"
 
-  sed -e "s/#HOSTNAME#/${hname}/" template_host.cnf > "working/${hname}.cnf"
+  sed -e "s/#HOSTNAME#/${hname:0:63}/" template_host.cnf > "working/${hname}.cnf"
 
   if [ "$hname" != "$hosts" ];
   then
@@ -73,7 +73,8 @@ for hosts in $*; do
       done
     done
 
-    sed -ci "s/# subjectAltName = #ALTNAMES#/subjectAltName = ${altnames}/" "working/${hname}.cnf"
+    tgt_file="working/${hname}.cnf"
+    sed -e "s/# subjectAltName = #ALTNAMES#/subjectAltName = ${altnames}/" "$tgt_file" 1<> "$tgt_file"
   fi
 
   echo "-- running openssl req"

data/lib/simp/beaker_helpers/ssg.rb

@@ -420,7 +420,11 @@ module Simp::BeakerHelpers
         #
         # This isn't 100% correct but it's "good enough" for an automated CI
         # environment to tell us if something is critically out of alignment.
-        on(@sut, %(cd scap-content/build-scripts; sed -ci 's/ssg.build_derivatives.profile_handling/__simp_dontcare__ = None #ssg.build_derivatives.profile_handling/g' enable_derivatives.py))
+        safe_sed(
+          @sut,
+          's/ssg.build_derivatives.profile_handling/__simp_dontcare__ = None #ssg.build_derivatives.profile_handling/g',
+          'scap-content/build-scripts/enable_derivatives.py'
+        )
 
         on(@sut, %(cd scap-content/build; cmake ../; make -j4 #{OS_INFO[@os][@os_rel]['ssg']['build_target']}-content && cp *ds.xml #{@scap_working_dir}))
       end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.24.4'
+  VERSION = '1.26.2'
 end

data/lib/simp/beaker_helpers.rb

@@ -12,6 +12,8 @@ module Simp::BeakerHelpers
   require 'simp/beaker_helpers/ssg'
   require 'simp/beaker_helpers/version'
 
+  @run_in_parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
+
   # Stealing this from the Ruby 2.5 Dir::Tmpname workaround from Rails
   def self.tmpname
     t = Time.new.strftime("%Y%m%d")
@@ -25,8 +27,7 @@ module Simp::BeakerHelpers
   #
   # Has no effect if yum or dnf is not present.
   def set_yum_opt_on(suts, key, value)
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       repo,target = key.split('.')
 
       unless target
@@ -56,8 +57,7 @@ module Simp::BeakerHelpers
   #     'foo.installonly_limit' => '5' # Applies only to the 'foo' repo
   #   }
   def set_yum_opts_on(suts, yum_opts={})
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       yum_opts.each_pair do |k,v|
         set_yum_opt_on(sut, k, v)
       end
@@ -70,8 +70,7 @@ module Simp::BeakerHelpers
       retry_interval: 10
     }
 
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       package_source = package_name unless package_source
 
       unless sut.check_for_package(package_name)
@@ -91,8 +90,7 @@ module Simp::BeakerHelpers
       retry_interval: 10
     }
 
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       package_source = package_name unless package_source
 
       if sut.check_for_package(package_name)
@@ -380,8 +378,7 @@ module Simp::BeakerHelpers
     opts[:pluginsync] = opts.fetch(:pluginsync, true)
 
     unless ENV['BEAKER_copy_fixtures'] == 'no'
-      parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-      block_on(suts, :run_in_parallel => parallel) do |sut|
+      block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
         STDERR.puts "  ** copy_fixture_modules_to: '#{sut}'" if ENV['BEAKER_helpers_verbose']
 
         # Use spec_prep to provide modules (this supports isolated networks)
@@ -443,8 +440,7 @@ module Simp::BeakerHelpers
   end
 
   def munge_ssh_crypto_policies(suts, key_types=['ssh-rsa'])
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       if has_crypto_policies(sut)
         install_latest_package_on(sut, 'crypto-policies', nil, :accept_all_exit_codes => true)
 
@@ -455,14 +451,31 @@ module Simp::BeakerHelpers
     end
   end
 
+  # Perform the equivalend of an in-place sed without changing the target inode
+  #
+  # Required for many container targets
+  def safe_sed(suts = hosts, pattern, target_file)
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
+      tmpfile = sut.tmpfile('safe_sed')
+
+      command = [
+        "cp #{target_file} #{tmpfile}",
+        "sed -i '#{pattern}' #{tmpfile}",
+        "cat #{tmpfile} > #{target_file}"
+      ].join(' && ')
+
+      on(sut, command)
+
+      sut.rm_rf(tmpfile)
+    end
+  end
+
   # Configure and reboot SUTs into FIPS mode
   def enable_fips_mode_on( suts = hosts )
     puts '== configuring FIPS mode on SUTs'
     puts '  -- (use BEAKER_fips=no to disable)'
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
 
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       next if sut[:hypervisor] == 'docker'
 
       if is_windows?(sut)
@@ -483,7 +496,7 @@ module Simp::BeakerHelpers
       #      that doesn't break vagrant access and is appropriate for
       #      typical module tests.)
       fips_ssh_ciphers = [ 'aes256-ctr','aes192-ctr','aes128-ctr']
-      on(sut, %(sed -ci '/Ciphers /d' /etc/ssh/sshd_config))
+      safe_sed(sut, '/Ciphers /d', '/etc/ssh/sshd_config')
       on(sut, %(echo 'Ciphers #{fips_ssh_ciphers.join(',')}' >> /etc/ssh/sshd_config))
 
       fips_enable_modulepath = ''
@@ -535,8 +548,7 @@ module Simp::BeakerHelpers
   #       - <URL to GPGKEY1>
   #       - <URL to GPGKEY2>
   def enable_yum_repos_on( suts = hosts )
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       if sut['yum_repos']
         sut['yum_repos'].each_pair do |repo, metadata|
           repo_manifest = create_yum_resource(repo, metadata)
@@ -617,8 +629,7 @@ module Simp::BeakerHelpers
   #
   # Can be disabled by setting BEAKER_enable_epel=no
   def enable_epel_on(suts)
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       if ONLINE
         os_info = fact_on(sut, 'os')
         os_maj_rel = os_info['release']['major']
@@ -661,8 +672,7 @@ module Simp::BeakerHelpers
   end
 
   def update_package_from_centos_stream(suts, package_name)
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       sut.install_package('centos-release-stream') unless sut.check_for_package('centos-release-stream')
       install_latest_package_on(sut, package_name)
       sut.uninstall_package('centos-release-stream')
@@ -670,8 +680,7 @@ module Simp::BeakerHelpers
   end
 
   def linux_errata( suts )
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       # Set the locale if not set
       sut.set_env_var('LANG', 'en_US.UTF-8') unless sut.get_env_var('LANG')
 
@@ -688,9 +697,14 @@ module Simp::BeakerHelpers
       if current_domain.empty?
         new_fqdn = hostname + '.beaker.test'
 
-        on(sut, "sed -ci 's/#{hostname}.*/#{new_fqdn} #{hostname}/' /etc/hosts")
-        on(sut, "echo '#{new_fqdn}' > /etc/hostname", :accept_all_exit_codes => true)
-        on(sut, "hostname #{new_fqdn}", :accept_all_exit_codes => true)
+        safe_sed(sut, 's/#{hostname}.*/#{new_fqdn} #{hostname}/', '/etc/hosts')
+
+        if !sut.which('hostnamectl').empty?
+          on(sut, "hostnamectl set-hostname #{new_fqdn}")
+        else
+          on(sut, "echo '#{new_fqdn}' > /etc/hostname", :accept_all_exit_codes => true)
+          on(sut, "hostname #{new_fqdn}", :accept_all_exit_codes => true)
+        end
 
         if sut.file_exist?('/etc/sysconfig/network')
           on(sut, "sed -s '/HOSTNAME=/d' /etc/sysconfig/network")
@@ -785,8 +799,7 @@ module Simp::BeakerHelpers
   def rhel_rhsm_subscribe(suts, *opts)
     require 'securerandom'
 
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       rhsm_opts = {
         :username => ENV['BEAKER_RHSM_USER'],
         :password => ENV['BEAKER_RHSM_PASS'],
@@ -838,8 +851,7 @@ module Simp::BeakerHelpers
   end
 
   def sosreport(suts, dest='sosreports')
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       install_latest_package_on(sut, 'sos')
       on(sut, 'sosreport --batch')
 
@@ -854,8 +866,7 @@ module Simp::BeakerHelpers
   end
 
   def rhel_repo_enable(suts, repos)
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       Array(repos).each do |repo|
         on(sut, %{subscription-manager repos --enable #{repo}})
       end
@@ -863,8 +874,7 @@ module Simp::BeakerHelpers
   end
 
   def rhel_repo_disable(suts, repos)
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       Array(repos).each do |repo|
         on(sut, %{subscription-manager repos --disable #{repo}}, :accept_all_exit_codes => true)
       end
@@ -872,16 +882,14 @@ module Simp::BeakerHelpers
   end
 
   def rhel_rhsm_unsubscribe(suts)
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       on(sut, %{subscription-manager unregister}, :accept_all_exit_codes => true)
     end
   end
 
   # Apply known OS fixes we need to run Beaker on each SUT
   def fix_errata_on( suts = hosts )
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       if is_windows?(sut)
         # Load the Windows requirements
         require 'simp/beaker_helpers/windows'
@@ -1091,8 +1099,7 @@ module Simp::BeakerHelpers
   def activate_interfaces(hosts)
     return if ENV['BEAKER_no_fix_interfaces']
 
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(hosts, :run_in_parallel => parallel) do |host|
+    block_on(hosts, :run_in_parallel => @run_in_parallel) do |host|
       if host[:platform] =~ /windows/
         puts "  -- SKIPPING #{host} because it is windows"
         next
@@ -1335,8 +1342,7 @@ module Simp::BeakerHelpers
           noop    => false
         }
     PLUGINSYNC_MANIFEST
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    apply_manifest_on(hosts, pluginsync_manifest, :run_in_parallel => parallel)
+    apply_manifest_on(hosts, pluginsync_manifest, :run_in_parallel => @run_in_parallel)
   end
 
 
@@ -1455,9 +1461,8 @@ module Simp::BeakerHelpers
       ENV['BEAKER_PUPPET_COLLECTION'] = install_info[:puppet_collection]
     end
 
-    require 'beaker/puppet_install_helper'
-
-    run_puppet_install_helper(install_info[:puppet_install_type], install_info[:puppet_install_version])
+    require 'beaker-puppet'
+    install_puppet_on(hosts, version: install_info[:puppet_install_version])
   end
 
   # Configure all SIMP repos on a host and disable all repos in the disable Array
@@ -1494,18 +1499,28 @@ module Simp::BeakerHelpers
 
     return if (ENV.fetch('SIMP_install_repos', 'yes') == 'no')
 
-    parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
-    block_on(suts, :run_in_parallel => parallel) do |sut|
+    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
       install_package_unless_present_on(sut, 'yum-utils')
 
+      os = fact_on(sut, 'os.name')
       release = fact_on(sut, 'os.release.major')
 
+      # Work around Amazon 2 compatibility
+      if (( os == 'Amazon' ) && ( "#{release}" == '2' ))
+        release = '7'
+      end
+
       install_package_unless_present_on(
         sut,
         'simp-release-community',
         "https://download.simp-project.com/simp-release-community.el#{release}.rpm"
       )
 
+      # TODO: Remove this hack-around when there's a version for AL2
+      if ( os == 'Amazon' )
+        on(sut, %(sed -i 's/$releasever/#{release}/g' /etc/yum.repos.d/simp*))
+      end
+
       to_disable = disable.dup
       to_disable += ENV.fetch('BEAKER_SIMP_disable_repos', '').split(',').map(&:strip)
 

data/lib/simp/rake/beaker.rb

@@ -2,7 +2,8 @@ require 'rake'
 require 'rake/clean'
 require 'rake/tasklib'
 require 'fileutils'
-require 'puppetlabs_spec_helper/tasks/beaker'
+require 'beaker/tasks/rake_task'
+require 'beaker-rspec/rake_task'
 require 'puppetlabs_spec_helper/tasks/fixtures'
 
 module Simp; end
@@ -224,7 +225,46 @@ module Simp::Rake
               nodesets << File.join(nodeset_path, 'default.yml')
             end
 
+            refined_nodesets = []
+
             nodesets.each do |nodeset_yml|
+              parsed_nodeset = ::Beaker::Options::HostsFileParser.parse_hosts_file(nodeset_yml)
+
+              # Default to multi-node testing for backwards compatibility
+              multi_node = (parsed_nodeset[:multi_node] == false ? false: true)
+
+              if multi_node
+                refined_nodesets.push(nodeset_yml)
+              else
+                parsed_nodeset_hosts = parsed_nodeset.delete(:HOSTS)
+
+                parsed_nodeset_hosts.each do |k,v|
+
+                  v[:roles] ||= []
+                  v[:roles] |= ['default']
+
+                  tmp_nodeset = {
+                    :HOSTS  => { k => v },
+                    :CONFIG => parsed_nodeset
+                  }
+
+                  tmp_nodeset_file = Tempfile.new("nodeset_#{k}-")
+                  tmp_nodeset_file.write(tmp_nodeset.to_yaml)
+                  tmp_nodeset_file.close
+
+                  refined_nodesets.push(tmp_nodeset_file.path)
+
+                  at_exit do
+                    if tmp_nodeset_file && File.exist?(tmp_nodeset_file.path)
+                      tmp_nodeset_file.close
+                      tmp_nodeset_file.unlink
+                    end
+                  end
+                end
+              end
+            end
+
+            refined_nodesets.sort.each do |nodeset_yml|
               unless File.file?(nodeset_yml)
                 # Get here if user has specified a non-existent nodeset or the
                 # implied `default` nodeset does not exist.

data/simp-beaker-helpers.gemspec

@@ -22,19 +22,14 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3.0'
 
   s.add_runtime_dependency 'beaker'                      , ['>= 4.17.0', '< 5.0.0']
-  s.add_runtime_dependency 'beaker-rspec'                , '~> 6.2'
+  s.add_runtime_dependency 'beaker-rspec'                , '~> 7.1'
   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 'beaker-puppet_install_helper', '~> 0.9'
   s.add_runtime_dependency 'highline'                    , '~> 2.0'
   s.add_runtime_dependency 'nokogiri'                    , '~> 1.8'
 
-  # Because net-telnet dropped support for Ruby < 2.3.0
-  # TODO: Update this when we no longer support Ruby 2.1.9 (should be October 2018)
-  s.add_runtime_dependency 'net-telnet', '~> 0.1.1'
-
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/acceptance/nodesets/amzn2.yml

@@ -0,0 +1,22 @@
+<%
+  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 %>
+
+CONFIG:
+  log_level: verbose
+  synced_folder : disabled
+  type: aio
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

data/spec/acceptance/nodesets/default.yml

@@ -8,8 +8,8 @@
 HOSTS:
   el7:
     roles:
+      - default
       - el7
-      - master
     platform: el-7-x86_64
     box: centos/7
     hypervisor: <%= hypervisor %>
@@ -18,13 +18,13 @@ HOSTS:
     roles:
       - el8
     platform: el-8-x86_64
-    box: generic/centos8
+    box: centos/stream8
     hypervisor: <%= hypervisor %>
 
 CONFIG:
+  multi_node: <%= ['yes','true'].include?(ENV['BEAKER_multi_node']) ? true : false %>
   log_level: verbose
   type: aio
-  vagrant_memsize: 512
   vagrant_cpus: 2
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>

data/spec/acceptance/nodesets/docker.yml

@@ -1,8 +1,8 @@
 HOSTS:
   el7.test.net:
     roles:
+      - default
       - el7
-      - master
     platform:   el-7-x86_64
     hypervisor: docker
     image: simpproject/simp_beaker_el7

data/spec/acceptance/nodesets/oel.yml

@@ -8,8 +8,8 @@
 HOSTS:
   oel7:
     roles:
+      - default
       - el7
-      - master
     platform: el-7-x86_64
     box: generic/oracle7
     hypervisor: <%= hypervisor %>
@@ -24,7 +24,6 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 1024
   vagrant_cpus: 2
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>

data/spec/acceptance/nodesets/ubuntu.yml

@@ -7,6 +7,8 @@
 -%>
 HOSTS:
   focal:
+    roles:
+      - default
     platform: ubuntu-20.04-x86_64
     box: ubuntu/focal64
     hypervisor: <%= hypervisor %>
@@ -14,7 +16,6 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 512
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
 <% end -%>

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -6,41 +6,41 @@ context 'after copy_fixture_modules_to( hosts )' do
     copy_fixture_modules_to( hosts )
   end
 
-  describe "fact_on(master,'root_home')" do
+  describe "fact_on(default,'root_home')" do
     it 'should not return value of `root_home`' do
-      expect(fact_on(master, 'root_home')).to eq ''
+      expect(fact_on(default, 'root_home')).to eq ''
     end
   end
 
-  describe "pfact_on(master,'root_home')" do
+  describe "pfact_on(default,'root_home')" do
     it 'should return value of `root_home`' do
-      expect(pfact_on(master, 'root_home')).to eq '/root'
+      expect(pfact_on(default, 'root_home')).to eq '/root'
     end
   end
 
-  describe "pfact_on(master,'os.release.major')" do
+  describe "pfact_on(default,'os.release.major')" do
     it 'should return the value of `os.release.major`' do
-      expect(pfact_on(master, 'os.release.major')).to match(/.+/)
+      expect(pfact_on(default, 'os.release.major')).to match(/.+/)
     end
   end
 
-  describe "pfact_on(master,'os.release.foo')" do
+  describe "pfact_on(default,'os.release.foo')" do
     it 'should not return the value of `os.release.foo`' do
-      expect(pfact_on(master, 'os.release.foo')).to eq ''
+      expect(pfact_on(default, 'os.release.foo')).to eq ''
     end
   end
 
-  describe "pfact_on(master,'fips_enabled')" do
+  describe "pfact_on(default,'fips_enabled')" do
     expected = (ENV['BEAKER_fips'] == 'yes')
 
     it 'should return false' do
-      expect(pfact_on(master, 'fips_enabled')).to eq expected
+      expect(pfact_on(default, 'fips_enabled')).to eq expected
     end
   end
 
   describe "pfact_on returns a hash" do
     it 'should return a Hash' do
-      expect(pfact_on(master, 'os')).to be_a(Hash)
+      expect(pfact_on(default, 'os')).to be_a(Hash)
     end
   end
 end

data/spec/acceptance/suites/default/pki_tests_spec.rb

@@ -4,21 +4,21 @@ require 'tmpdir'
 
 context 'PKI operations' do
 
-  context 'after run_fake_pki_ca_on(master,hosts)' do
+  context 'after run_fake_pki_ca_on(default,hosts)' do
     before(:all) do
       copy_fixture_modules_to( hosts )
     end
 
     shared_examples_for 'a correctly copied keydist/ tree' do |test_dir|
       it 'correctly copies keydist/ tree' do
-        on(master, "ls -d #{test_dir}" +
+        on(default, "ls -d #{test_dir}" +
                    " #{test_dir}/cacerts" +
                    " #{test_dir}/cacerts/cacert_*.pem"
           )
 
         hosts.each do |host|
           name = host.node_name
-          on(master, "ls -d #{test_dir}/#{name}/cacerts" +
+          on(default, "ls -d #{test_dir}/#{name}/cacerts" +
                      " #{test_dir}/#{name}/#{name}.pem"  +
                      " #{test_dir}/#{name}/#{name}.pub"  +
                      " #{test_dir}/cacerts/cacert_*.pem"
@@ -29,10 +29,10 @@ context 'PKI operations' do
 
     describe 'a Fake CA under /root' do
       tmp_keydist_dir = Dir.mktmpdir 'simp-beaker-helpers__pki-tests'
-      run_fake_pki_ca_on( master, hosts, tmp_keydist_dir  )
+      run_fake_pki_ca_on( default, hosts, tmp_keydist_dir  )
 
       it 'should create /root/pki' do
-        on(master, 'test -d /root/pki')
+        on(default, 'test -d /root/pki')
       end
 
       it_behaves_like 'a correctly copied keydist/ tree', '/root/pki/keydist'
@@ -41,13 +41,13 @@ context 'PKI operations' do
 
     describe 'after copy_keydist_to' do
       test_dir = '/etc/puppetlabs/code/environments/production/modules/pki/files/keydist'
-      copy_keydist_to(master)
+      copy_keydist_to(default)
       it_behaves_like 'a correctly copied keydist/ tree', test_dir
     end
 
-    describe 'after copy_keydist_to(master,"/tmp/foo")' do
+    describe 'after copy_keydist_to(default,"/tmp/foo")' do
       test_dir = '/tmp/foo'
-      copy_keydist_to(master, test_dir)
+      copy_keydist_to(default, test_dir)
       it_behaves_like 'a correctly copied keydist/ tree', test_dir
     end
 

data/spec/acceptance/suites/windows/00_default_spec.rb

@@ -5,8 +5,6 @@ require 'beaker-rspec'
 require 'simp/beaker_helpers'
 include Simp::BeakerHelpers
 
-require 'beaker/puppet_install_helper'
-
 unless ENV['BEAKER_provision'] == 'no'
   hosts.each do |host|
     unless Simp::BeakerHelpers::Snapshot.exist?(host, 'puppet_installed')

data/spec/acceptance/suites/windows/nodesets/default.yml

@@ -29,7 +29,6 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 256
 <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
   puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
 <% end -%>

data/spec/acceptance/suites/windows/nodesets/win2016.yml

@@ -29,7 +29,6 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 256
 <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
   puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
 <% end -%>

data/spec/acceptance/suites/windows/nodesets/win2019.yml

@@ -28,7 +28,6 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 256
 <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
   puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
 <% end -%>

data/spec/spec_helper_acceptance.rb

@@ -18,8 +18,40 @@ end
 
 RSpec.configure do |c|
   # ensure that environment OS is ready on each host
-  fix_errata_on(hosts)
+  fix_errata_on hosts
+
+  # Detect cases in which no examples are executed (e.g., nodeset does not
+  # have hosts with required roles)
+  c.fail_if_no_examples = true
 
   # Readable test descriptions
   c.formatter = :documentation
+
+  # Configure all nodes in nodeset
+  c.before :suite do
+    begin
+      # Install modules and dependencies from spec/fixtures/modules
+      copy_fixture_modules_to( hosts )
+      begin
+        server = only_host_with_role(hosts, 'server')
+      rescue ArgumentError =>e
+        server = only_host_with_role(hosts, 'default')
+      end
+
+      # Generate and install PKI certificates on each SUT
+      Dir.mktmpdir do |cert_dir|
+        run_fake_pki_ca_on(server, hosts, cert_dir )
+        hosts.each{ |sut| copy_pki_to( sut, cert_dir, '/etc/pki/simp-testing' )}
+      end
+
+      # add PKI keys
+      copy_keydist_to(server)
+    rescue StandardError, ScriptError => e
+      if ENV['PRY']
+        require 'pry'; binding.pry
+      else
+        raise e
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.24.4
+  version: 1.26.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: beaker-puppet
   requirement: !ruby/object:Gem::Requirement
@@ -125,20 +125,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: beaker-puppet_install_helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -167,20 +153,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: net-telnet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 description: "    Beaker helper methods to help scaffold SIMP acceptance tests\n"
 email: simp@simp-project.org
 executables: []
@@ -219,6 +191,7 @@ files:
 - lib/simp/beaker_helpers/windows.rb
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
+- spec/acceptance/nodesets/amzn2.yml
 - spec/acceptance/nodesets/default.yml
 - spec/acceptance/nodesets/docker.yml
 - spec/acceptance/nodesets/oel.yml