simp-beaker-helpers 1.24.2 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ebfb21a6409e25775b605532f96982fe2bfc200dced0a88683427bf1c3818e
-  data.tar.gz: 94ecd0803ebda28858480211e6fc0d0ab0402c96dbf3101fa4f6a7f17070c11e
+  metadata.gz: bce7304da1a7425de25af167725291b8889ca26e1bbbed5559b0583fb900a1b4
+  data.tar.gz: 359b9c5c9eda2855e7eab95f1afc7837f3fbc108ccef4aaf2eb6d2b0d9f7858f
 SHA512:
-  metadata.gz: 72fb511dc7fb090c5ae5f80170975af6c0e33ebf01744b090a1cae8579e052d8baa354b9d42e9b9a9b50fda12afc54e8e519e1278bc565633b8777be79827c18
-  data.tar.gz: 4629b633ec4a047d1549fa9f7ab2dbc457a72e1770cfbff8aaf9eba9a5648905a9be87b32a5191797caab501e25e47ba6cb975e70a1ebc9ca9b0bd16f34201de
+  metadata.gz: 9ea99cff5b4a6e7e0f7fe1720efe7e439215ea14cbc0f278fe7a0f314470a3026fe64717d55559e1c80945ac4cb28289f25344b5e5e7a978516d11029b1f1add
+  data.tar.gz: 336a178662a391759629d6d539aaf78b3ecb7d7fc93804e49e63bf03057cb87a6d9f996298c8a203a31e4aec4ee299df8dd49ba68e950df216769553edf4d2f7

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
 # ------------------------------------------------------------------------------
@@ -21,7 +21,7 @@
 #
 # NOTES:
 #
-# * The CHANGLOG text is altered to remove RPM-style date headers, which don't
+# * The CHANGELOG text is altered to remove RPM-style date headers, which don't
 #   render well as markdown on the GitHub release pages
 #
 # * By default, the gem is built and released using the standard rake tasks
@@ -37,12 +37,15 @@
 #   All keys are optional.
 #
 ---
-name: 'Tag: Release to GitHub & rubygems.org'
+name: 'Tag: Release to GitHub + rubygems.org (no RPMS)'
 
 on:
   push:
     tags:
+      # NOTE: These filter patterns aren't actually regexes:
+      #   https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
       - '[0-9]+\.[0-9]+\.[0-9]+'
+      - '[0-9]+\.[0-9]+\.[0-9]+\-[a-z]+[0-9]+'
 
 env:
   PUPPET_VERSION: '~> 6'
@@ -52,7 +55,7 @@ jobs:
   releng-checks:
     name: "RELENG checks"
     if: github.repository_owner == 'simp'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     outputs:
       build_command: ${{ steps.commands.outputs.build_command }}
       release_command: ${{ steps.commands.outputs.release_command }}
@@ -64,11 +67,11 @@ jobs:
         with:
           ref: ${{ github.ref }}
           clean: true
-      - name: Determing build and release commands
+      - 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'
@@ -92,9 +95,7 @@ jobs:
           ruby-version: 2.5
           bundler-cache: true
       - name: Test build the package
-        env:
-          GEM_BUILD_COMMAND: ${{ steps.commands.outputs.build_command }}
-        run: "$GEM_BUILD_COMMAND"
+        run: "${{ steps.commands.outputs.build_command }}"
       - name: "Assert '${{ github.ref }}' matches the package version"
         run: |
           tag="${GITHUB_REF/refs\/tags\//}"
@@ -109,7 +110,9 @@ jobs:
     name: Deploy GitHub Release
     needs: [ releng-checks ]
     if: github.repository_owner == 'simp'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
+    outputs:
+      prerelease: ${{ steps.tag-check.outputs.prerelease }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -117,6 +120,7 @@ jobs:
           ref: ${{ github.ref }}
           clean: true
           fetch-depth: 0
+
       - name: Get tag & annotation info (${{github.ref}})
         id: tag-check
         run: |
@@ -124,7 +128,19 @@ jobs:
           annotation="$(git for-each-ref "$GITHUB_REF" --format='%(contents)' --count=1)"
           annotation_title="$(echo "$annotation" | head -1)"
 
+
+          if [[ "$tag" =~ ^(simp-|v)?[0-9]+\.[0-9]+\.[0-9]+(-(rc|alpha|beta|pre|post)?([0-9]+)?)?$ ]]; then
+            if [ -n "${BASH_REMATCH[2]}" ]; then
+              prerelease=yes
+              annotation_title="Pre-release of ${tag}"
+            fi
+          else
+            printf '::error ::Release Tag format is not SemVer, X.Y.Z-R, X.Y.Z-<prerelease>: "%s"\n' "$RELEASE_TAG"
+            exit 88
+          fi
+
           echo "::set-output name=tag::${tag}"
+          echo "::set-output name=prerelease::${prerelease}"
           echo "::set-output name=annotation_title::${annotation_title}"
 
           # Prepare annotation body as a file for the next step
@@ -146,14 +162,14 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: ${{ steps.tag-check.outputs.annotation_title }}
           body_path: /tmp/annotation.body
+          prerelease: ${{ steps.tag-check.outputs.prerelease  == 'yes'}}
           draft: false
-          prerelease: false
 
   deploy-rubygem:
     name: Deploy RubyGem Release
-    needs: [ releng-checks ]
-    if: github.repository_owner == 'simp'
-    runs-on: ubuntu-18.04
+    needs: [ releng-checks, create-github-release ]
+    if: (github.repository_owner == 'simp') && (needs.create-github-release.outputs.prerelease != 'yes')
+    runs-on: ubuntu-latest
     env:
       RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
       BUILD_COMMAND: ${{ needs.releng-checks.outputs.build_command }}

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

@@ -209,13 +209,6 @@ variables:
 # Puppet Versions
 #-----------------------------------------------------------------------
 
-.pup_5_x: &pup_5_x
-  image: 'ruby:2.4'
-  variables:
-    PUPPET_VERSION: '~> 5.0'
-    BEAKER_PUPPET_COLLECTION: 'puppet5'
-    MATRIX_RUBY_VERSION: '2.4'
-
 .pup_6_x: &pup_6_x
   image: 'ruby:2.5'
   variables:
@@ -320,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
@@ -332,12 +331,6 @@ fips_from_fixtures:
   script:
     - bundle exec rake beaker:suites[fips_from_fixtures]
 
-puppet5_collections:
-  <<: *pup_5_x
-  <<: *acceptance_base
-  script:
-    - bundle exec rake beaker:suites[puppet_collections]
-
 puppet6_collections:
   <<: *pup_6_x
   <<: *acceptance_base

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 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`
+* Removed:
+  * Dropped acceptance tests for Puppet 5.5
+
+[MODULES-11315]: https://tickets.puppetlabs.com/browse/MODULES-11315
+
+### 1.24.3 / 2022-04-10
+* Fixed:
+  * Added python-setuptools to the list of required packages
+
 ### 1.24.2 / 2022-03-09
 * Fixed:
   * Prevent `spec/` directory symlink recursion in `copy_fixture_modules_to`

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

@@ -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/files/puppet-agent-versions.yaml

@@ -44,3 +44,4 @@ version_mappings:
   '4.2.0':  '1.2.1'
   '4.1.0':  '1.1.1'
   '4.0.0':  '1.0.1'
+  '6.27.0':  '6.27.1' # latest gem is 6.7.0, only RPM is 6.7.1

data/lib/simp/beaker_helpers/ssg.rb

@@ -23,11 +23,12 @@ module Simp::BeakerHelpers
       'PyYAML',
       'cmake',
       'git',
-      'openscap-scanner',
       'openscap-python',
+      'openscap-scanner',
       'openscap-utils',
       'python-jinja2',
-      'python-lxml'
+      'python-lxml',
+      'python-setuptools'
     ]
 
     EL8_PACKAGES = [
@@ -41,6 +42,7 @@ module Simp::BeakerHelpers
       'python3-jinja2',
       'python3-lxml',
       'python3-pyyaml',
+      'python3-setuptools',
       'libarchive'
     ]
 
@@ -418,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.2'
+  VERSION = '1.25.0'
 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

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,23 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  amzn2:
+    roles:
+      - master
+      - 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

@@ -18,21 +18,12 @@ HOSTS:
     roles:
       - el8
     platform: el-8-x86_64
-    box: generic/centos8
-    hypervisor: <%= hypervisor %>
-
-  el8-0:
-    roles:
-      - el8
-    platform: el-8-x86_64
-    box: centos/8
-    box_version: "1905.1"
+    box: centos/stream8
     hypervisor: <%= hypervisor %>
 
 CONFIG:
   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/oel.yml

@@ -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

@@ -14,7 +14,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/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.2
+  version: 1.25.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-06-17 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