simp-beaker-helpers 1.18.6 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db7d012be090122587cb25885faf36c1d8717d3c9f6e86714adb558512ea280
-  data.tar.gz: 7a4e2a70a8fb671f140bc9f44598898eb95c4b7eef3b43f4fd6ea85ed7901bfe
+  metadata.gz: de616faf054a99c350f9a6241296669ce630fff0d6d622fd60c9a36ea2e2a036
+  data.tar.gz: cdbc0d01a23a79472998e87ccbd850e5a32f4e56aa04b623c1b05c050254df92
 SHA512:
-  metadata.gz: 9262da4359d9ca19e65349c3ba6f44f55323167aea9343ae93f8222e70145d6264d90403de65b3874bbe1ebd59e11f826bc9f65c3f2fdaa4e15ccb492a2c42eb
-  data.tar.gz: cf24bab582eb4c373b46d6c7e597e5e690d1a163c49b85d816ef4926ea78959959acaa81c215a5ee6f1678a01271a3dac3ca66d77de1e51707775d93ec9de093
+  metadata.gz: 9539f40a2fbf685e6d3a4763a69aaf5670d80e73a695eab4c029d294523612e847ca16132119a459d4381508e267642065c9f7ff99198ddabe8e4008562d7674
+  data.tar.gz: b6ed70ae00c28cfe70705cc704df6206318734ae941ef5848751caa8a37506a1e6a4432fd324a7752aae5dfdcd5fc38baa0e029ae3e17fd5cb6094649432b29e

data/.fips_fixtures

@@ -0,0 +1,8 @@
+---
+fixtures:
+  repositories:
+    fips: https://github.com/simp/pupmod-simp-fips
+    augeasproviders_core: https://github.com/simp/augeasproviders_core
+    augeasproviders_grub: https://github.com/simp/augeasproviders_grub
+    simplib: https://github.com/simp/pupmod-simp-simplib
+    stdlib: https://github.com/simp/puppetlabs-stdlib

data/.fixtures.yml

@@ -1,8 +1,6 @@
 ---
 fixtures:
-  # Needed for Hiera v5 to work
-  forge_modules:
-    compliance_markup: "simp/compliance_markup"
   repositories:
-    stdlib: "https://github.com/simp/puppetlabs-stdlib"
+    stdlib: https://github.com/simp/puppetlabs-stdlib
+    compliance_markup: https://github.com/simp/pupmod-simp-compliance_markup
 

data/.gitlab-ci.yml

@@ -20,16 +20,6 @@
     - 'rm -rf pkg/ || :'
     - bundle check || rm -f Gemfile.lock && ("${BUNDLER_INSTALL[@]}" --local || "${BUNDLER_INSTALL[@]}")
 
-
-.validation_checks: &validation_checks
-  script:
-    - bundle exec rake syntax
-    - bundle exec rake check:dot_underscore
-    - bundle exec rake check:test_file
-    - bundle exec rake lint
-    # - bundle exec rake pkg:check_version
-    # - bundle exec rake pkg:compare_latest_tag
-
 .spec_tests: &spec_tests
   script:
     - bundle exec rake spec
@@ -42,43 +32,8 @@
       - $SIMP_FULL_MATRIX
 
 stages:
-  - validation
   - unit
   - acceptance
-  - deploy
-
-# Puppet 4.10 for PE 2017.2 support (EOL:2018-02-21)
-# See: https://puppet.com/misc/puppet-enterprise-lifecycle
-# --------------------------------------
-2_1-validation:
-  stage: validation
-  tags:
-    - docker
-  image: ruby:2.1
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  <<: *validation_checks
-
-2_1-unit:
-  stage: unit
-  tags:
-    - docker
-  image: ruby:2.1
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  <<: *spec_tests
-
-# Puppet 4.10 for PE 2017.2 support (EOL:2018-02-21)
-# See: https://puppet.com/misc/puppet-enterprise-lifecycle
-# --------------------------------------
-2_4-validation:
-  stage: validation
-  tags:
-    - docker
-  image: ruby:2.4
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  <<: *validation_checks
 
 2_4-unit:
   stage: unit
@@ -127,7 +82,7 @@ fips_from_fixtures:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[fips_from_fixtures]
 
-puppet_collections:
+puppet5_collections:
   stage: acceptance
   tags:
     - beaker
@@ -135,7 +90,18 @@ puppet_collections:
   <<: *setup_bundler_env
   variables:
     PUPPET_VERSION: '~> 5.3'
-    BEAKER_PUPPET_COLLECTION: 'puppet5'
+  script:
+    - bundle exec rake spec_clean
+    - bundle exec rake beaker:suites[puppet_collections]
+
+puppet6_collections:
+  stage: acceptance
+  tags:
+    - beaker
+  <<: *cache_bundler
+  <<: *setup_bundler_env
+  variables:
+    BEAKER_PUPPET_COLLECTION: 'puppet6'
   script:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[puppet_collections]
@@ -152,6 +118,8 @@ windows:
 
 snapshot:
   stage: acceptance
+  # This is prone to breakage in the underlying system
+  allow_failure: true
   tags:
     - beaker
   <<: *cache_bundler

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+### 1.19.1 / 2020-12-02
+* Fixed:
+  * Bumped the core puppet version to 6.X
+  * Fixed the file_content_on method
+  * Removed EL 6 support from the tests since the core repos are defunct
+  * Started removing some of the puppet 4 tests
+
+### 1.19.0 / 2020-09-30
+* Fixed:
+  * rsync handling has a better check to see if rsync actually works prior to
+    using it.  The old method had the potential to try and use rsync even if it
+    no longer worked (FIPS flipped for example).
+* Changed:
+  * Migrated from PackageCloud to the SIMP download server for updates moving
+    forward.
+
+### 1.18.9 / 2020-08-04
+* Change windows 2012r2 VM to work around issues where the old image had
+  duplicate ports trying to be opened
+* Increase test CA bits to 4096
+
+### 1.18.8 / 2020-07-14
+* Allow the beaker version to be pinned by environment variable
+
+### 1.18.7 / 2020-07-07
+* Fix host reference bug when switching to FIPS mode
+* Ensure that net-ssh 6+ can access older FIPS systems
+
 ### 1.18.6 / 2020-06-24
 * Fix Vagrant snapshot issues
 

data/Gemfile

@@ -13,11 +13,38 @@ gem 'bundler'
 gem 'rake'
 
 group :system_tests do
-  gem 'beaker'
+  beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.17.0', '< 5.0.0'])
+
+  if "#{beaker_gem_options}".include?(':')
+    # Just pass in BEAKER_GEM_OPTIONS as a string that would represent the usual
+    # hash of options.
+    #
+    # Something like: BEAKER_GEM_OPTIONS=':git => "https://my.repo/beaker.git", :tag => "1.2.3"'
+    #
+    # No, this isn't robust, but it's not really an 'every day' sort of thing
+    # and safer than an `eval`
+    begin
+      gem 'beaker', Hash[
+        beaker_gem_options.split(',').map do |x| # Split passed options on k/v pairs
+          x.gsub('"', '').strip.split(/:\s|\s+=>\s+/) # Allow for either format hash keys
+        end.map do |k,v|
+          [
+            k.delete(':').to_sym, # Convert all keys to symbols
+            v.strip
+          ]
+        end
+      ] # Convert the whole thing to a valid Hash
+    rescue => e
+      raise "Invalid BEAKER_GEM_OPTIONS: '#{beaker_gem_options}' => '#{e}'"
+    end
+  else
+    gem 'beaker', beaker_gem_options
+  end
+
   gem 'beaker-rspec'
   gem 'beaker-windows'
   gem 'net-ssh'
-  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 5.0')
+  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 6.0')
   gem 'puppetlabs_spec_helper'
   gem 'rubocop'
   gem 'rubocop-rspec'

data/files/pki/template_ca.cnf

@@ -93,7 +93,7 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits		= 2048
+default_bits		= 4096
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes

data/files/pki/template_host.cnf

@@ -96,7 +96,7 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits		= 2048
+default_bits		= 4096
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes

data/lib/simp/beaker_helpers.rb

@@ -30,16 +30,38 @@ module Simp::BeakerHelpers
              ).output.strip == '1'
   end
 
+  def rsync_functional_on?(sut)
+    # We have to check if rsync *still* works otherwise
+    return false if (@rsync_functional == false)
+
+    require 'facter'
+    unless Facter::Util::Resolution.which('rsync')
+      @rsync_functional = false
+      return @rsync_functional
+    end
+
+    require 'tempfile'
+
+    testfile = Tempfile.new('rsync_check')
+    testfile.puts('test')
+    testfile.close
+
+    begin
+      rsync_to(sut, testfile.path, sut.system_temp_path)
+    rescue Beaker::Host::CommandFailure
+      @rsync_functional = false
+      return false
+    ensure
+      testfile.unlink
+    end
+
+    return true
+  end
+
   # Figure out the best method to copy files to a host and use it
   #
   # Will create the directories leading up to the target if they don't exist
   def copy_to(sut, src, dest, opts={})
-    unless fips_enabled(sut) || @has_rsync
-      %x{which rsync 2>/dev/null}.strip
-
-      @has_rsync = !$?.nil? && $?.success?
-    end
-
     sut.mkdir_p(File.dirname(dest))
 
     if sut[:hypervisor] == 'docker'
@@ -57,7 +79,7 @@ module Simp::BeakerHelpers
         container_id = sut.host_hash[:docker_container_id]
       end
       %x(tar #{exclude_list.join(' ')} -hcf - -C "#{File.dirname(src)}" "#{File.basename(src)}" | docker exec -i "#{container_id}" tar -C "#{dest}" -xf -)
-    elsif @has_rsync && sut.check_for_command('rsync')
+    elsif rsync_functional_on?(sut)
       # This makes rsync_to work like beaker and scp usually do
       exclude_hack = %(__-__' -L --exclude '__-__)
 
@@ -297,7 +319,7 @@ module Simp::BeakerHelpers
       # TODO Use simp-ssh Puppet module appropriately (i.e., in a fashion
       #      that doesn't break vagrant access and is appropriate for
       #      typical module tests.)
-      fips_ssh_ciphers = [ 'aes256-cbc','aes192-cbc','aes128-cbc']
+      fips_ssh_ciphers = [ 'aes256-ctr','aes192-ctr','aes128-ctr']
       on(sut, %(sed -i '/Ciphers /d' /etc/ssh/sshd_config))
       on(sut, %(echo 'Ciphers #{fips_ssh_ciphers.join(',')}' >> /etc/ssh/sshd_config))
 
@@ -333,8 +355,8 @@ module Simp::BeakerHelpers
       # Hopefully, Vagrant will update the used ciphers at some point but who
       # knows when that will be
       opensshserver_config = '/etc/crypto-policies/back-ends/opensshserver.config'
-      if file_exists_on(host, opensshserver_config)
-        on(host, "sed --follow-symlinks -i 's/PubkeyAcceptedKeyTypes=/PubkeyAcceptedKeyTypes=ssh-rsa,/' #{opensshserver_config}")
+      if file_exists_on(sut, opensshserver_config)
+        on(sut, "sed --follow-symlinks -i 's/PubkeyAcceptedKeyTypes=/PubkeyAcceptedKeyTypes=ssh-rsa,/' #{opensshserver_config}")
       end
 
       sut.reboot
@@ -584,7 +606,7 @@ module Simp::BeakerHelpers
   end
 
   def sosreport(sut, dest='sosreports')
-    sut.install_package('sos')
+    on(sut, 'puppet resource package sos ensure=latest')
     on(sut, 'sosreport --batch')
 
     files = on(sut, 'ls /var/tmp/sosreport* /tmp/sosreport* 2>/dev/null', :accept_all_exit_codes => true).output.lines.map(&:strip)
@@ -864,10 +886,10 @@ done
     file_content = nil
 
     if file_exists_on(sut, path)
-      Dir.mktempdir do |dir|
-        scp_from(host, path, dir)
+      Dir.mktmpdir do |dir|
+        scp_from(sut, path, dir)
 
-        file_content = File.read(File.basename(path))
+        file_content = File.read(File.join(dir,File.basename(path)))
       end
     end
 
@@ -1170,62 +1192,73 @@ done
     run_puppet_install_helper(install_info[:puppet_install_type], install_info[:puppet_install_version])
   end
 
-  # Configure all SIMP repos on a host and enable all but those listed in the disable list
+  # Configure all SIMP repos on a host and disable all repos in the disable Array
   #
-  # @param sut Host on which to configure SIMP repos
-  # @param disable List of SIMP repos to disable
-  # @raise if disable contains an invalid repo name.
+  # @param sut [Beaker::Host]  Host on which to configure SIMP repos
+  # @param disable [Array[String]] List of repos to disable
+  # @raise [StandardError] if disable contains an invalid repo name.
   #
   # Examples:
   #  install_simp_repos( myhost )           # install all the repos an enable them.
   #  install_simp_repos( myhost, ['simp'])  # install the repos but disable the simp repo.
   #
-  # Current set of valid SIMP repo names:
-  #  'simp'
-  #  'simp_deps'
+  # Valid repo names include any repository available on the system.
   #
-  def install_simp_repos(sut, disable = [] )
-    repos = {
-      'simp' => {
-        :baseurl   => 'https://packagecloud.io/simp-project/6_X/el/$releasever/$basearch',
-        :gpgkey    => ['https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP',
-                    'https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6'
-                     ],
-        :gpgcheck  => 1,
-        :sslverify => 1,
-        :sslcacert => '/etc/pki/tls/certs/ca-bundle.crt',
-        :metadata_expire => 300
-      },
-      'simp_deps' => {
-        :baseurl   => 'https://packagecloud.io/simp-project/6_X_Dependencies/el/$releasever/$basearch',
-        :gpgkey    => ['https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP',
-                    'https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6',
-                    'https://yum.puppet.com/RPM-GPG-KEY-puppetlabs',
-                    'https://yum.puppet.com/RPM-GPG-KEY-puppet',
-                    'https://apt.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-96',
-                    'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
-                    'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana',
-                    'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever'
-                   ],
-        :gpgcheck  => 1,
-        :sslverify => 1,
-        :sslcacert => '/etc/pki/tls/certs/ca-bundle.crt',
-        :metadata_expire => 300
-      }
-    }
-    # Verify that the repos passed to disable are in the list of valid repos
-    disable.each { |d|
-      unless repos.has_key?(d)
-        raise("ERROR: install_simp_repo - disable contains invalid SIMP repo '#{d}'.")
+  # For backwards compatibility purposes, the following translations are
+  # automatically performed:
+  #
+  #  * 'simp'
+  #    * 'simp-community-simp'
+  #
+  #  * 'simp_deps'
+  #    * 'simp-community-epel'
+  #    * 'simp-community-postgres'
+  #    * 'simp-community-puppet'
+  #
+  def install_simp_repos(sut, disable = [])
+    # NOTE: Do *NOT* use puppet in this method since it may not be available yet
+
+    if on(sut, 'rpm -q yum-utils', :accept_all_exit_codes => true).exit_code != 0
+      on(sut, 'yum -y install yum-utils')
+    end
+
+    if on(sut, 'rpm -q simp-release-community', :accept_all_exit_codes => true).exit_code != 0
+      on(sut, 'yum -y install "https://download.simp-project.com/simp-release-community.rpm"')
+    end
+
+    to_disable = disable.dup
+
+    unless to_disable.empty?
+      if to_disable.include?('simp')
+        to_disable.delete('simp')
+        to_disable << 'simp-community-simp'
       end
-    }
-    repo_manifest = ''
-    repos.each { | repo, metadata|
-      metadata[:enabled] = disable.include?(repo) ? 0 : 1
-      repo_manifest << create_yum_resource(repo, metadata)
-    }
-    apply_manifest_on(sut, repo_manifest, :catch_failures => true)
-  end
-end
 
+      if to_disable.include?('simp_deps')
+        to_disable.delete('simp_deps')
+        to_disable << 'simp-community-epel'
+        to_disable << 'simp-community-postgres'
+        to_disable << 'simp-community-puppet'
+      end
+
+      # NOTE: This --enablerepo enables the repos for listing and is inherited
+      # from YUM. This does not actually "enable" the repos, that would require
+      # the "--enable" option (from yum-config-manager) :-D.
+      #
+      # Note: Certain versions of EL8 do not dump by default and EL7 does not
+      # have the '--dump' option.
+      available_repos = on(sut, %{yum-config-manager --enablerepo="*" || yum-config-manager --enablerepo="*" --dump}).stdout.lines.grep(/\A\[(.+)\]\Z/){|x| $1}
+
+      invalid_repos = (to_disable - available_repos)
+
+      # Verify that the repos passed to disable are in the list of valid repos
+      unless invalid_repos.empty?
+        logger.warn(%{WARN: install_simp_repo - requested repos to disable do not exist on the target system '#{invalid_repos.join("', '")}'.})
+      end
 
+      (to_disable - invalid_repos).each do |repo|
+        on(sut, %{yum-config-manager --disable "#{repo}"})
+      end
+    end
+  end
+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 = '~> 5.0'
+  DEFAULT_PUPPET_AGENT_VERSION = '~> 6.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.18.6'
+  VERSION = '1.19.1'
 end

data/spec/acceptance/nodesets/default.yml

@@ -9,18 +9,18 @@ HOSTS:
   server-el7:
     roles:
       - server
-      - default
       - master
+      - default
       - el7
     platform: el-7-x86_64
     box: centos/7
     hypervisor: <%= hypervisor %>
 
-  server-el6:
+  server-el8:
     roles:
-      - el6
-    platform: el-6-x86_64
-    box: centos/6
+      - el8
+    platform: el-8-x86_64
+    box: centos/8
     hypervisor: <%= hypervisor %>
 
 CONFIG:

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

@@ -14,8 +14,8 @@ hosts.each do |host|
           expect(client_puppet_version.split('.').first).to eq(puppet_collection_version)
         end
       else
-        it 'should not be running puppet 5' do
-          expect(client_puppet_version.split('.').first).to eq '5'
+        it 'should be running puppet 6' do
+          expect(client_puppet_version.split('.').first).to eq '6'
         end
       end
     end

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

@@ -2,42 +2,36 @@ require 'spec_helper_acceptance'
 
 hosts.each do |host|
   describe '#write_hieradata_to' do
+    expect_failures = false
+    if hosts_with_role(hosts, 'el8').include?(host)
+      expect_failures = true
+    end
 
     it 'should install yum utils' do
       host.install_package('yum-utils')
     end
 
-    context 'defailt settings' do
+    context 'default settings' do
       before(:all) { install_simp_repos(host) }
 
-      it 'creates the repo' do
-        on host, 'test -f /etc/yum.repos.d/simp.repo'
-        on host, 'test -f /etc/yum.repos.d/simp_deps.repo'
-      end
-
       it 'enables the correct repos' do
-        simp6info = on(host, '/usr/bin/yum repolist -v simp | grep ^Repo-status').stdout.strip
-        expect(simp6info).to match(/.*Repo-status.*enabled.*/)
-        simp6depsinfo = on(host, 'yum repolist -v simp_deps| grep ^Repo-status').stdout.strip
-        expect(simp6depsinfo).to match(/.*Repo-status.*enabled.*/)
+        skip "#{host} is not supported yet" if expect_failures
+        on(host, 'yum -y list simp')
+        on(host, 'yum -y list postgresql96')
       end
     end
 
     context 'when passed a disabled list ' do
-      before(:all) { install_simp_repos(host, ['simp'] ) }
+      before(:all) { install_simp_repos(host, ['simp-community-simp'] ) }
 
-      it 'creates the repo' do
-        on host, 'test -f /etc/yum.repos.d/simp.repo'
-        on host, 'test -f /etc/yum.repos.d/simp_deps.repo'
+      it 'enables the correct repos' do
+        skip "#{host} is not supported yet" if expect_failures
+        on(host, 'yum -y list postgresql96')
       end
 
-      it 'enables the correct repos' do
-        simp6info = on(host, 'yum repolist -v simp | grep ^Repo-status').stdout.strip
-        expect(simp6info).to match(/.*Repo-status.*disabled.*/)
-        simp6depsinfo = on(host, 'yum repolist -v simp_deps| grep ^Repo-status').stdout.strip
-        expect(simp6depsinfo).to match(/.*Repo-status.*enabled.*/)
+      it 'disables the correct repos' do
+        on(host, 'yum -y list simp', :acceptable_exit_codes => [1])
       end
     end
-
   end
 end

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

@@ -31,7 +31,10 @@ ScrubFixtures.new
 ENV['BEAKER_fips'] = 'yes'
 ENV['FIXTURES_YML'] = alt_fixtures
 
+beaker_gem_options = ENV['BEAKER_GEM_OPTIONS']
+
 Bundler.with_clean_env{
+  ENV['BEAKER_GEM_OPTIONS'] = beaker_gem_options
   ENV['FIXTURES_YML'] = alt_fixtures
 
   %x{bundle exec rake spec_prep}

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

@@ -1,24 +1,22 @@
-# This needs to be done so that we actually bring in a collection at the start
-# of the run
-#
-# Choosing an arbitrary number in the middle of 5 so that we're not fooled by
-# edge cases
-#
-ENV['PUPPET_VERSION'] = '5.1'
-
 require 'spec_helper_acceptance'
 
-Bundler.with_clean_env{
-  %x{bundle exec rake spec_prep}
-}
+unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
+  fail('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
+end
+
+if ENV['BEAKER_PUPPET_COLLECTION']
+  target_version = ENV['BEAKER_PUPPET_COLLECTION'][/(\d+)$/,1]
+elsif ENV['PUPPET_VERSION']
+  target_version = ENV['PUPPET_VERSION'].split('.').first
+end
 
 hosts.each do |host|
   describe 'make sure puppet version is valid' do
     context "on #{host}" do
       client_puppet_version = on(host, 'puppet --version').output.strip
 
-      it "should be running puppet version #{ENV['PUPPET_VERSION']}}" do
-        expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(ENV['PUPPET_VERSION'])
+      it "should be running puppet version #{target_version}" do
+        expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(target_version)
       end
     end
   end

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

@@ -10,12 +10,14 @@ HOSTS:
     roles:
       - windows
     platform: windows-server-amd64
-    box: opentable/win-2012r2-standard-amd64-nocm # VBOX ONLY
+    box: devopsgroup-io/windows_server-2012r2-standard-amd64-nocm
     hypervisor: <%= hypervisor %>
     vagrant_memsize: 2048
     vagrant_cpus: 2
     user: vagrant
     is_cygwin: false
+    ssh:
+      host_key: ssh-dss
 
   el7:
     roles:

data/spec/lib/simp/beaker_helpers_spec.rb

@@ -103,21 +103,11 @@ describe 'Simp::BeakerHelpers' do
     end
 
     it 'uses defaults when no environment variables are set' do
-      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^5\./)
-      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet5')
+      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^6\./)
+      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet6')
       expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('agent')
     end
 
-    it 'extracts info from PUPPET_INSTALL_VERSION for Puppet 4' do
-      ENV['PUPPET_INSTALL_VERSION']= '4.10.5'
-      expected = {
-        :puppet_install_version => '1.10.5',
-        :puppet_collection      => nil,
-        :puppet_install_type    => 'agent'
-      }
-      expect( @helper.get_puppet_install_info ).to eq expected
-    end
-
     it 'extracts info from PUPPET_INSTALL_VERSION for Puppet 5' do
       allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
       ENV['PUPPET_INSTALL_VERSION']= '5.5.0'
@@ -153,26 +143,6 @@ describe 'Simp::BeakerHelpers' do
       expect( @helper.get_puppet_install_info ).to eq expected
     end
 
-    it 'extracts info from BEAKER_PUPPET_AGENT_VERSION' do
-      ENV['BEAKER_PUPPET_AGENT_VERSION']= '4.10.5'
-      expected = {
-        :puppet_install_version   => '1.10.5',
-        :puppet_collection        => nil,
-        :puppet_install_type      => 'agent'
-      }
-      expect( @helper.get_puppet_install_info ).to eq expected
-    end
-
-    it 'extracts info from PUPPET_VERSION' do
-      ENV['PUPPET_VERSION']= '4.10.5'
-      expected = {
-        :puppet_install_version   => '1.10.5',
-        :puppet_collection        => nil,
-        :puppet_install_type      => 'agent'
-      }
-      expect( @helper.get_puppet_install_info ).to eq expected
-    end
-
     it 'extracts info from BEAKER_PUPPET_COLLECTION' do
       allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
       ENV['BEAKER_PUPPET_COLLECTION']= 'puppet5'
@@ -198,9 +168,9 @@ describe 'Simp::BeakerHelpers' do
     it 'extracts info from PUPPET_INSTALL_TYPE' do
       ENV['PUPPET_INSTALL_TYPE'] = 'pe'
 
-      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet5')
+      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet6')
       expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('pe')
-      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^5\./)
+      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^6\./)
     end
 
     it 'fails when BEAKER_PUPPET_COLLECTION is invalid' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.18.6
+  version: 1.19.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -161,6 +161,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".fips_fixtures"
 - ".fixtures.yml"
 - ".gitignore"
 - ".gitlab-ci.yml"
@@ -203,7 +204,6 @@ files:
 - spec/acceptance/suites/offline/nodesets/default.yml
 - spec/acceptance/suites/puppet_collections/00_default_spec.rb
 - spec/acceptance/suites/puppet_collections/metadata.yml
-- spec/acceptance/suites/puppet_collections/nodesets/default.yml
 - spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
 - spec/acceptance/suites/snapshot/10_general_usage_spec.rb
 - spec/acceptance/suites/snapshot/nodesets
@@ -235,37 +235,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP
-test_files:
-- spec/acceptance/nodesets/default.yml
-- spec/acceptance/suites/default/check_puppet_version_spec.rb
-- spec/acceptance/suites/default/enable_fips_spec.rb
-- spec/acceptance/suites/default/fixture_modules_spec.rb
-- spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
-- spec/acceptance/suites/default/nodesets
-- spec/acceptance/suites/default/pki_tests_spec.rb
-- spec/acceptance/suites/default/set_hieradata_on_spec.rb
-- spec/acceptance/suites/default/write_hieradata_to_spec.rb
-- spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb
-- spec/acceptance/suites/fips_from_fixtures/metadata.yml
-- spec/acceptance/suites/fips_from_fixtures/nodesets
-- spec/acceptance/suites/offline/00_default_spec.rb
-- spec/acceptance/suites/offline/README
-- spec/acceptance/suites/offline/nodesets/default.yml
-- spec/acceptance/suites/puppet_collections/00_default_spec.rb
-- spec/acceptance/suites/puppet_collections/metadata.yml
-- spec/acceptance/suites/puppet_collections/nodesets/default.yml
-- spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
-- spec/acceptance/suites/snapshot/10_general_usage_spec.rb
-- spec/acceptance/suites/snapshot/nodesets
-- spec/acceptance/suites/windows/00_default_spec.rb
-- spec/acceptance/suites/windows/metadata.yml
-- spec/acceptance/suites/windows/nodesets/default.yml
-- spec/acceptance/suites/windows/nodesets/win2016.yml
-- spec/acceptance/suites/windows/nodesets/win2019.yml
-- spec/lib/simp/beaker_helpers_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper_acceptance.rb
+test_files: []

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

@@ -1,30 +0,0 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
-HOSTS:
-  server-el7:
-    roles:
-      - server
-      - default
-      - master
-      - el7
-    platform: el-7-x86_64
-    box: centos/7
-    hypervisor: <%= hypervisor %>
-
-  server-el6:
-    roles:
-      - el6
-    platform: el-6-x86_64
-    box: centos/6
-    hypervisor: <%= hypervisor %>
-
-CONFIG:
-  log_level: verbose
-  type: aio
-  puppet_collection: puppet5
-  vagrant_memsize: 256