simp-beaker-helpers 1.19.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 658d1ab2cfb6ff32a020283a3a754fd3d8d4eb50cc73b73286422ea5178d48d3
-  data.tar.gz: b6a7d451700d8ac207905a20014c405f2aa06731f281720dec6a49cae5d34d33
+  metadata.gz: 7fc677903ad549041397ba842f11a2861c5e99b0b6c9717e0ac48e61485b6a7a
+  data.tar.gz: 824a685974d1bb8df8ba9335d1176c4ea281d77f79d7ecc76c3fd68b88a82a79
 SHA512:
-  metadata.gz: 13d63f19f099f8ca503d447cf41d150c3d74710c9ceca8a1b7c8dad655d783bd534cc117dc326235b6eb4e7ef6306b1ba6864df0c8add83eaad1737d48cdbf38
-  data.tar.gz: fe95f26b05dfaeff5be470af3c79d3cb3d7a5fc82ac7dde590f5770647d8b058774cfbc8691a00c3323c4ad85608cac7085b0764f4293e68daec6a6889669af4
+  metadata.gz: 31f997ddbe976bdfbc8fd904a7f8db3a972c6cfb47b62db12483fef311d1eb550caa2fd643e6abaf6dadd92063c288edb9217b472564b3c74af170f828449680
+  data.tar.gz: 7e3a00581115a489502e13f542246aed81be117d104df938b4097e086300649a732c9d6e9094a3e6696cf35b24a30b63a10df9db71158d298a88919530a9bc8d

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

@@ -2,5 +2,6 @@
 fixtures:
   repositories:
     stdlib: https://github.com/simp/puppetlabs-stdlib
+    simplib: https://github.com/simp/pupmod-simp-simplib
     compliance_markup: https://github.com/simp/pupmod-simp-compliance_markup
 

data/.gitignore

@@ -1,3 +1,4 @@
+.fips_fixtures.yml
 *.gem
 *.swp
 Gemfile.lock

data/.gitlab-ci.yml

@@ -1,131 +1,376 @@
+# ------------------------------------------------------------------------------
+#             NOTICE: **This file is maintained with puppetsync**
+#
+# This file is updated automatically as part of a puppet module baseline.
+#
+# The next baseline sync will overwrite any local changes to everything above
+# the line "# Repo-specific content"
+# ------------------------------------------------------------------------------
+# The testing matrix considers ruby/puppet versions supported by SIMP and PE:
+#
+# https://puppet.com/docs/pe/2019.8/component_versions_in_recent_pe_releases.html
+# https://puppet.com/misc/puppet-enterprise-lifecycle
+# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
+# ------------------------------------------------------------------------------
+# Release       Puppet   Ruby    EOL
+# SIMP 6.4      5.5      2.4.10  TBD
+# PE 2018.1     5.5      2.4.10  2021-01 (LTS overlap)
+# PE 2019.8     6.18     2.5.7   2022-12 (LTS)
 ---
-.cache_bundler: &cache_bundler
+
+stages:
+  - 'validation'
+  - 'acceptance'
+  - 'compliance'
+  - 'deployment'
+
+variables:
+  # PUPPET_VERSION is a canary variable!
+  #
+  # The value `UNDEFINED` will (intentionally) cause `bundler install|update` to
+  # fail.  The intended value for PUPPET_VERSION is provided by the `pup_#` YAML
+  # anchors.  If it is still `UNDEFINED`, all the other setting from the job's
+  # anchor are also missing.
+  PUPPET_VERSION:    'UNDEFINED' # <- Matrixed jobs MUST override this (or fail)
+  BUNDLER_VERSION:   '1.17.1'
+  SIMP_MATRIX_LEVEL: '1'
+  SIMP_FORCE_RUN_MATRIX: 'no'
+
+  # Force dependencies into a path the gitlab-runner user can write to.
+  # (This avoids some failures on Runners with misconfigured ruby environments.)
+  GEM_HOME:          .vendor/gem_install
+  BUNDLE_CACHE_PATH: .vendor/bundle
+  BUNDLE_PATH:       .vendor/bundle
+  BUNDLE_BIN:        .vendor/gem_install/bin
+  BUNDLE_NO_PRUNE:   'true'
+
+
+# bundler dependencies + caching, optional RVM setup, with diagnostic output
+# --------------------------------------------------------------------------
+.setup_bundler_env: &setup_bundler_env
   cache:
-    untracked: true
-    # A broad attempt at caching between runs (ala Travis CI)
-    key: "${CI_PROJECT_NAMESPACE}__bundler"
+    # Cache bundler gems between pipelines for each Ruby version
+    key: "${CI_PROJECT_NAMESPACE}_ruby-${MATRIX_RUBY_VERSION}_bundler"
     paths:
       - '.vendor'
-      - 'vendor'
-
-.setup_bundler_env: &setup_bundler_env
   before_script:
-    - 'echo Files in cache: $(find .vendor | wc -l) || :'
-    - 'export GEM_HOME=.vendor/gem_install'
-    - 'export BUNDLE_CACHE_PATH=.vendor/bundler'
-    - 'declare GEM_BUNDLER_VER=(-v ''~> ${BUNDLER_VERSION:-1.16.0}'')'
-    - declare GEM_INSTALL=(gem install --no-document)
-    - declare BUNDLER_INSTALL=(bundle install --no-binstubs --jobs $(nproc) --path=.vendor "${FLAGS[@]}")
-    - gem list -ie "${GEM_BUNDLE_VER[@]}" --silent bundler || "${GEM_INSTALL[@]}" --local "${GEM_BUNDLE_VER[@]}" bundler || "${GEM_INSTALL[@]}" "${GEM_BUNDLE_VER[@]}" bundler
+    - 'ruby -e "puts %(\n\n), %q(=)*80, %(\nSIMP-relevant Environment Variables:\n\n#{e=ENV.keys.grep(/^PUPPET|^SIMP|^BEAKER|MATRIX/); pad=e.map{|x| x.size}.max+1; e.map{|v| %(    * #{%(#{v}:).ljust(pad)} #{39.chr + ENV[v] + 39.chr}\n)}.join}\n),  %q(=)*80, %(\n\n)"'
+    # Diagnostic ruby & gem information
+    - 'which ruby && ruby --version || :'
+    - "[[ $- == *i* ]] && echo 'Interactive shell session' || echo 'Non-interactive shell session'"
+    - "shopt -q login_shell && echo 'Login shell' || echo 'Not a login shell'"
+    - 'rvm ls || :'
+
+    # If RVM is available, make SURE it's using the right Ruby:
+    #   * Source rvm (to run in non-login shells)
+    #   * If any $MATRIX_RUBY_VERSION rubies are available, use the latest
+    #   * Otherwise: install & use ${MATRIX_RUBY_VERSION}-head (e.g., latest)
+    #     * ^^ This could be wonky and introduce variations across runners
+    #     * ^^ maybe it should just fail if there is no $MATRIX_RUBY_VERSION installed?
+    - "command -v rvm && { if declare -p rvm_path &> /dev/null; then source \"${rvm_path}/scripts/rvm\"; else source \"$HOME/.rvm/scripts/rvm\" || source /etc/profile.d/rvm.sh; fi; }"
+    - "command -v rvm && { LATEST_RVM_RUBY_XY=\"$(rvm ls | grep \"$MATRIX_RUBY_VERSION\" | tail -1 | sed -e 's/^.*\\([0-9]\\+\\.[0-9]\\+\\.[0-9]\\+\\).*$/\\1/g')\"; if [ -z \"$LATEST_RVM_RUBY_XY\" ]; then LATEST_RVM_RUBY_XY=\"${MATRIX_RUBY_VERSION}-head\"; rvm install \"$LATEST_RVM_RUBY\" --no-docs; else echo \"Found RVM Ruby: '${LATEST_RVM_RUBY_XY}'\"; fi; rvm use \"$LATEST_RVM_RUBY_XY\" ;  }"
+    - 'ruby --version || :'
+    - 'gem list sync || :'
+
+    # Bundle gems (preferring cached > local > downloaded resources)
+    #   * Try to use cached and local resources before downloading dependencies
+    - 'declare GEM_BUNDLER_VER=(-v "~> ${BUNDLER_VERSION:-1.17.1}")'
+    - 'declare GEM_INSTALL_CMD=(gem install --no-document)'
+    - 'declare BUNDLER_INSTALL_CMD=(bundle install --no-binstubs --jobs $(nproc) "${FLAGS[@]}")'
+    - 'mkdir -p ${GEM_HOME} ${BUNDLER_BIN}'
+    - 'gem list -ie "${GEM_BUNDLER_VER[@]}" --silent bundler || "${GEM_INSTALL_CMD[@]}" --local "${GEM_BUNDLER_VER[@]}" bundler || "${GEM_INSTALL_CMD[@]}" "${GEM_BUNDLER_VER[@]}" bundler'
     - 'rm -rf pkg/ || :'
-    - bundle check || rm -f Gemfile.lock && ("${BUNDLER_INSTALL[@]}" --local || "${BUNDLER_INSTALL[@]}")
+    - 'bundle check || rm -f Gemfile.lock && ("${BUNDLER_INSTALL_CMD[@]}" --local || "${BUNDLER_INSTALL_CMD[@]}" || bundle pristine ||  "${BUNDLER_INSTALL_CMD[@]}") || { echo "PIPELINE: Bundler could not install everything (see log output above)" && exit 99 ; }'
+
+    # Diagnostic bundler, ruby, and gem checks:
+    - 'bundle exec rvm ls || :'
+    - 'bundle exec which ruby || :'
+    - 'bundle show sync || :'
+    - 'bundle exec gem list sync || :'
+
+
+# Assign a matrix level when your test will run.  Heavier jobs get higher numbers
+# NOTE: To skip all jobs with a SIMP_MATRIX_LEVEL, set SIMP_MATRIX_LEVEL=0
+# ------------------------------------------------------------------------------
+
+.relevant_file_conditions_trigger_spec_tests: &relevant_file_conditions_trigger_spec_tests
+  changes:
+    - .gitlab-ci.yml
+    - .fixtures.yml
+    - .rspec
+    - metadata.json
+    - "spec/spec_helper.rb"
+    - "spec/{classes,unit,defines,type_aliases,types,hosts,lib}/**/*.rb"
+    - "{SIMP,data,manifests,files,types,lib}/**/*"
+    - "templates/**/*.{erb,epp}"
+    - "Gemfile"
+  exists:
+    - "spec/{classes,unit,defines,type_aliases,types,hosts,lib}/**/*_spec.rb"
+
+.relevant_file_conditions_trigger_acceptance_tests: &relevant_file_conditions_trigger_acceptance_tests
+  changes:
+    - .gitlab-ci.yml
+    - .fixtures.yml
+    - "spec/spec_helper_acceptance.rb"
+    - "spec/acceptance/**/*"
+    - "{SIMP,data,manifests,files,types,lib}/**/*"
+    - "templates/**/*.{erb,epp}"
+    - "Gemfile"
+  exists:
+    - "spec/acceptance/**/*_spec.rb"
+
+# For some reason, the rule regexes stopped matching line starts inside
+# $CI_COMMIT_MESSAGE with carets /^/, so we're using /\n?/ as a workaround.
+.skip_job_when_commit_message_says_to: &skip_job_when_commit_message_says_to
+  if: '$CI_COMMIT_MESSAGE =~ /\n?CI: (SKIP MATRIX|MATRIX LEVEL 0)/'
+  when: never
+
+.force_run_job_when_commit_message_lvl_1_or_above: &force_run_job_when_commit_mssage_lvl_1_or_above
+  if: '$CI_COMMIT_MESSAGE =~ /\n?CI: MATRIX LEVEL [123]/'
+  when: on_success
+
+.force_run_job_when_commit_message_lvl_2_or_above: &force_run_job_when_commit_mssage_lvl_2_or_above
+  if: '$CI_COMMIT_MESSAGE =~ /\n?CI: MATRIX LEVEL [23]/'
+  when: on_success
+
+.force_run_job_when_commit_message_lvl_3_or_above: &force_run_job_when_commit_mssage_lvl_3_or_above
+  if: '$CI_COMMIT_MESSAGE =~ /\n?CI: MATRIX LEVEL [3]/'
+  when: on_success
+
+# check for $CI_PIPELINE_SOURCE needed because this is combined w/when:changes
+.run_job_when_level_1_or_above_w_changes: &run_job_when_level_1_or_above_w_changes
+  if: '$SIMP_MATRIX_LEVEL =~ /^[123]$/ && $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+  when: on_success
+
+.run_job_when_level_2_or_above_w_changes: &run_job_when_level_2_or_above_w_changes
+  if: '$SIMP_MATRIX_LEVEL =~ /^[23]$/ && $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+  when: on_success
 
-.spec_tests: &spec_tests
+.run_job_when_level_3_or_above_w_changes: &run_job_when_level_3_or_above_w_changes
+  if: '$SIMP_MATRIX_LEVEL =~ /^[3]$/ && $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+  when: on_success
+
+.force_run_job_when_var_and_lvl_1_or_above: &force_run_job_when_var_and_lvl_1_or_above
+  if: '$SIMP_FORCE_RUN_MATRIX == "yes" && $SIMP_MATRIX_LEVEL =~ /^[123]$/'
+  when: on_success
+
+.force_run_job_when_var_and_lvl_2_or_above: &force_run_job_when_var_and_lvl_2_or_above
+  if: '$SIMP_FORCE_RUN_MATRIX == "yes" && $SIMP_MATRIX_LEVEL =~ /^[23]$/'
+  when: on_success
+
+.force_run_job_when_var_and_lvl_3_or_above: &force_run_job_when_var_and_lvl_3_or_above
+  if: '$SIMP_FORCE_RUN_MATRIX == "yes" && $SIMP_MATRIX_LEVEL =~ /^[3]$/'
+  when: on_success
+
+
+
+# SIMP_MATRIX_LEVEL=1: Intended to run every commit
+.with_SIMP_ACCEPTANCE_MATRIX_LEVEL_1: &with_SIMP_ACCEPTANCE_MATRIX_LEVEL_1
+  rules:
+    - <<: *skip_job_when_commit_message_says_to
+    - <<: *force_run_job_when_var_and_lvl_1_or_above
+    - <<: *force_run_job_when_commit_mssage_lvl_1_or_above
+    - <<: *run_job_when_level_1_or_above_w_changes
+      <<: *relevant_file_conditions_trigger_acceptance_tests
+    - when: never
+
+.with_SIMP_SPEC_MATRIX_LEVEL_1: &with_SIMP_SPEC_MATRIX_LEVEL_1
+  rules:
+    - <<: *skip_job_when_commit_message_says_to
+    - <<: *force_run_job_when_commit_mssage_lvl_1_or_above
+    - <<: *force_run_job_when_var_and_lvl_1_or_above
+    - <<: *run_job_when_level_1_or_above_w_changes
+      <<: *relevant_file_conditions_trigger_spec_tests
+    - when: never
+
+# SIMP_MATRIX_LEVEL=2: Resource-heavy or redundant jobs
+.with_SIMP_ACCEPTANCE_MATRIX_LEVEL_2: &with_SIMP_ACCEPTANCE_MATRIX_LEVEL_2
+  rules:
+    - <<: *skip_job_when_commit_message_says_to
+    - <<: *force_run_job_when_var_and_lvl_2_or_above
+    - <<: *force_run_job_when_commit_mssage_lvl_2_or_above
+    - <<: *run_job_when_level_2_or_above_w_changes
+      <<: *relevant_file_conditions_trigger_acceptance_tests
+    - when: never
+
+.with_SIMP_SPEC_MATRIX_LEVEL_2: &with_SIMP_SPEC_MATRIX_LEVEL_2
+  rules:
+    - <<: *skip_job_when_commit_message_says_to
+    - <<: *force_run_job_when_commit_mssage_lvl_2_or_above
+    - <<: *force_run_job_when_var_and_lvl_2_or_above
+    - <<: *run_job_when_level_2_or_above_w_changes
+      <<: *relevant_file_conditions_trigger_spec_tests
+    - when: never
+
+# SIMP_MATRIX_LEVEL=3: Reserved for FULL matrix testing
+.with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3: &with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3
+  rules:
+    - <<: *skip_job_when_commit_message_says_to
+    - <<: *force_run_job_when_var_and_lvl_3_or_above
+    - <<: *force_run_job_when_commit_mssage_lvl_3_or_above
+    - <<: *run_job_when_level_3_or_above_w_changes
+      <<: *relevant_file_conditions_trigger_acceptance_tests
+    - when: never
+
+
+# Puppet Versions
+#-----------------------------------------------------------------------
+
+.pup_5: &pup_5
+  image: 'ruby:2.4'
+  variables:
+    PUPPET_VERSION: '~> 5.0'
+    BEAKER_PUPPET_COLLECTION: 'puppet5'
+    MATRIX_RUBY_VERSION: '2.4'
+
+.pup_6: &pup_6
+  image: 'ruby:2.5'
+  variables:
+    PUPPET_VERSION: '~> 6.0'
+    BEAKER_PUPPET_COLLECTION: 'puppet6'
+    MATRIX_RUBY_VERSION: '2.5'
+
+.pup_6_18_0: &pup_6_18_0
+  image: 'ruby:2.5'
+  variables:
+    PUPPET_VERSION: '6.18.0'
+    BEAKER_PUPPET_COLLECTION: 'puppet6'
+    MATRIX_RUBY_VERSION: '2.5'
+
+.pup_7: &pup_7
+  image: 'ruby:2.7'
+  variables:
+    PUPPET_VERSION: '~> 7.0'
+    BEAKER_PUPPET_COLLECTION: 'puppet7'
+    MATRIX_RUBY_VERSION: '2.7'
+
+# Testing Environments
+#-----------------------------------------------------------------------
+
+.lint_tests: &lint_tests
+  stage: 'validation'
+  tags: ['docker']
+  <<: *setup_bundler_env
   script:
-    - bundle exec rake spec
+    - 'bundle exec rake syntax'
+    - 'bundle exec rake lint'
+    - 'bundle exec rake metadata_lint'
 
-# To avoid running a prohibitive number of tests every commit,
-# don't set this env var in your gitlab instance
-.only_with_SIMP_FULL_MATRIX: &only_with_SIMP_FULL_MATRIX
-  only:
-    variables:
-      - $SIMP_FULL_MATRIX
+.unit_tests: &unit_tests
+  stage: 'validation'
+  tags: ['docker']
+  <<: *setup_bundler_env
+  <<: *with_SIMP_SPEC_MATRIX_LEVEL_1
+  script:
+    - 'bundle exec rake spec'
 
-stages:
-  - unit
-  - acceptance
-
-2_4-unit:
-  stage: unit
-  tags:
-    - docker
-  image: ruby:2.4
-  <<: *cache_bundler
+.acceptance_base: &acceptance_base
+  stage: 'acceptance'
+  tags: ['beaker']
   <<: *setup_bundler_env
-  <<: *spec_tests
+  <<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_1
+
+.compliance_base: &compliance_base
+  stage: 'compliance'
+  tags: ['beaker']
+  <<: *setup_bundler_env
+  <<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_1
+
+
+# Unit Tests
+#-----------------------------------------------------------------------
+
+pup5-unit:
+  <<: *pup_5
+  <<: *unit_tests
+
+pup6-unit:
+  <<: *pup_6
+  <<: *unit_tests
+
+pup7-unit:
+  <<: *pup_7
+  <<: *unit_tests
+
+# ------------------------------------------------------------------------------
+#             NOTICE: **This file is maintained with puppetsync**
+#
+# Everything above the "Repo-specific content" comment will be overwritten by
+# the next puppetsync.
+# ------------------------------------------------------------------------------
+
+# Repo-specific content
+# ==============================================================================
+
+#=======================================================================
+# Packaging test
+
+pup5-pkg:
+  <<: *pup_5
+  <<: *unit_tests
+  script:
+    'bundle exec rake pkg:gem'
 
+pup6-pkg:
+  <<: *pup_6
+  <<: *unit_tests
+  script:
+    'bundle exec rake pkg:gem'
+
+pup7-pkg:
+  <<: *pup_7
+  <<: *unit_tests
+  script:
+    'bundle exec rake pkg:gem'
 
 #=======================================================================
 # Acceptance tests
 default:
-  stage: acceptance
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
+  <<: *pup_6
+  <<: *acceptance_base
   script:
-    - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[default]
 
 default-fips:
-  stage: acceptance
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  variables:
-    BEAKER_fips: 'yes'
+  <<: *pup_6
+  <<: *acceptance_base
   script:
-    - bundle exec rake spec_clean
-    - bundle exec rake beaker:suites[default]
+    - BEAKER_fips=yes bundle exec rake beaker:suites[default]
 
 fips_from_fixtures:
-  stage: acceptance
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  variables:
-    PUPPET_VERSION: '~> 5.3'
-    BEAKER_PUPPET_COLLECTION: 'puppet5'
+  <<: *pup_6
+  <<: *acceptance_base
   script:
-    - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[fips_from_fixtures]
 
 puppet5_collections:
-  stage: acceptance
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  variables:
-    PUPPET_VERSION: '~> 5.3'
+  <<: *pup_5
+  <<: *acceptance_base
   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'
+  <<: *pup_6
+  <<: *acceptance_base
+  script:
+    - bundle exec rake beaker:suites[puppet_collections]
+
+puppet7_collections:
+  <<: *pup_7
+  <<: *acceptance_base
   script:
-    - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[puppet_collections]
 
 windows:
-  stage: acceptance
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
+  <<: *pup_6
+  <<: *acceptance_base
   script:
-    - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[windows]
 
 snapshot:
-  stage: acceptance
+  <<: *pup_6
+  <<: *acceptance_base
   # This is prone to breakage in the underlying system
   allow_failure: true
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  variables:
-    BEAKER_simp_snapshot: 'yes'
   script:
-    - bundle exec rake spec_clean
-    - bundle exec rake beaker:suites[snapshot]
+    - BEAKER_simp_snapshot=yes bundle exec rake beaker:suites[snapshot]

data/.travis.yml

@@ -1,36 +1,42 @@
 ---
-language: ruby
-cache: bundler
-sudo: false
-before_install:
-  - rm Gemfile.lock || true
-bundler_args: "--without development --path .vendor"
+language: shell
 notifications:
   email: false
-rvm:
-  - 2.4.4
-env:
-  - SIMP_SKIP_NON_SIMPOS_TESTS=1
-script:
-  - bundle exec rake spec
-before_deploy:
-  - bundle exec rake clobber
-  - "export GEM_VERSION=`ruby -r ./lib/simp/beaker_helpers/version.rb -e 'puts Simp::BeakerHelpers::VERSION'`"
-  - '[[ $TRAVIS_TAG =~ ^${GEM_VERSION}$ ]]'
-deploy:
-  - provider: rubygems
-    gemspec: simp-beaker-helpers.gemspec
-    gem: simp-beaker-helpers
-    api_key:
-      secure: "AlnBx0dBSxn+S97n0h14ltKUOA+6v0bc7QZPIcwGJV9nnf1hKH3pf9La1TVknEx7XgpAcM9jusQJ7hBlqvSq8z8SFF0bZk1EgSRIKc1cuYPLiGyUM2O7+AFHyCy3iCnPvKeoQmE/BJb5O1dGnbmSbf4A0fqLxA7jiHG1j7z+cnmJB1i67wovDfl13TsOXyBfbespWBMMc0BKAw56FPs9XggAk2cNusS3hd5tqW1AZPT2/xwt+d8ngkmO96u8QcichYRFQ+w+XW4H0w935wNg/dWiskJlt7TIYVAh4Ko5s2DZKf52Tne8TugALSn0LhRatpp7sw1FTTpteCW8UqK8uwGC2hM4pZViAOv4P1YObz2IPOZPriBl+cCayJdMKnotkUJliAMnw5TLiSWKLou+S0Pdj2h3fJZWdOEwRPMzIVoJtsOHG3GdNcPL6f7iU0vP/wr6FeR3uWa+fA7NHRi2Du955O8JpogjdrW08ahcAEwhtI3A4mrA08wN09axsrwr093uDRm/5h4FHyAhExJ0YiA/6kcPpUvILcLStyHe0RQDICQMdsQo2DSbnL65w3QjFa2fML2Shf9cRwX06+ia2BxozWzFD/6p3RiRtPxphnbFiUdjYSGWcwCcUgbJx9SW04lSSxOhpyItuXgxZqiybkzstXd6riu5zwg1R8TWk34="
-    on:
-      tags: true
-      rvm: 2.4.4
-      condition: "($SKIP_PUBLISH != true)"
-  - provider: releases
-    api_key:
-      secure: "I41p4aqjkrNDHJhZ5gWC4gzn7BVwEYRm5Q3PAxQRSIUDB/QTVgNqZx8YptkuIvSGpw8kIywyZg3NKdzGUO8aJJ0NlXapL7e9qQIigkYhdaCZjZFG5zIxdOFs4sVoz/6vnQT9JIcGWy7uS5xiNOulGvfEWU78+e+I9yPdT74RApve5VAVT/km5lV5ldRnwwehLnTx+volUlnOD8rwfizoVLqFTrfRfr4cVMF605UYyaiVxHF50hywFRZoAdVcMEhlLQnQXfz/ZsLMJLJm9eCpjQ989N0oX6theSLCcv7QtHcWMXydjWMcpuTfBZSFrwUVbC23uMOKTJVEWq5LMG3m2L6hP3//2gvUzGhOVLvoGuC+erboB7QoXdcoOgXY+dTZPMcPBxpArdDLWVQSLTvPs05QzpaUdRLVMC/kD1d1EudlEicgkNgNDBhBn3089nVmvKndbKLvj+23a5AQVVbs+8C0x+SJvTc9N2N+bmuH7jIJPrEvWK4xwcQa+g2M/EBv05jaEdSErlVa6B6UKCH0Lea9rpy1se9vn5OzpaaMCCJIpcpQqHDjo0PMAQXBSbqjKcBei6lR5fIFl5UO9gWP1v8PGPuCzGTBivQ92XlgV1TWXmdbJHwIuSbJx3Ali7Wp19RR4E4uHC+TPFssvgkh9ZLkORnWWS35wzzU1LkwWx0="
-    on:
-      tags: true
-      rvm: 2.4.4
-      condition: "($SKIP_PUBLISH != true)"
+stages:
+  - name: deploy
+    if: 'tag IS present'
+
+###  Testing on Travis CI is indefinitely disabled
+###
+###  See:
+###    * https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing
+###    * https://simp-project.atlassian.net/browse/SIMP-8703
+jobs:
+  include:
+    - stage: deploy
+      script: skip
+      cache: bundler
+      before_install:
+        - rm Gemfile.lock || true
+      bundler_args: "--without development --path .vendor"
+      language: ruby
+      rvm: 2.4.5
+      before_deploy:
+        - bundle exec rake clobber
+        - "export GEM_VERSION=`ruby -r ./lib/simp/beaker_helpers/version.rb -e 'puts Simp::BeakerHelpers::VERSION'`"
+        - '[[ $TRAVIS_TAG =~ ^${GEM_VERSION}$ ]]'
+      deploy:
+        - provider: rubygems
+          gemspec: simp-beaker-helpers.gemspec
+          gem: simp-beaker-helpers
+          token:
+            secure: "AlnBx0dBSxn+S97n0h14ltKUOA+6v0bc7QZPIcwGJV9nnf1hKH3pf9La1TVknEx7XgpAcM9jusQJ7hBlqvSq8z8SFF0bZk1EgSRIKc1cuYPLiGyUM2O7+AFHyCy3iCnPvKeoQmE/BJb5O1dGnbmSbf4A0fqLxA7jiHG1j7z+cnmJB1i67wovDfl13TsOXyBfbespWBMMc0BKAw56FPs9XggAk2cNusS3hd5tqW1AZPT2/xwt+d8ngkmO96u8QcichYRFQ+w+XW4H0w935wNg/dWiskJlt7TIYVAh4Ko5s2DZKf52Tne8TugALSn0LhRatpp7sw1FTTpteCW8UqK8uwGC2hM4pZViAOv4P1YObz2IPOZPriBl+cCayJdMKnotkUJliAMnw5TLiSWKLou+S0Pdj2h3fJZWdOEwRPMzIVoJtsOHG3GdNcPL6f7iU0vP/wr6FeR3uWa+fA7NHRi2Du955O8JpogjdrW08ahcAEwhtI3A4mrA08wN09axsrwr093uDRm/5h4FHyAhExJ0YiA/6kcPpUvILcLStyHe0RQDICQMdsQo2DSbnL65w3QjFa2fML2Shf9cRwX06+ia2BxozWzFD/6p3RiRtPxphnbFiUdjYSGWcwCcUgbJx9SW04lSSxOhpyItuXgxZqiybkzstXd6riu5zwg1R8TWk34="
+          on:
+            tags: true
+            condition: "($SKIP_PUBLISH != true)"
+        - provider: releases
+          token:
+            secure: "I41p4aqjkrNDHJhZ5gWC4gzn7BVwEYRm5Q3PAxQRSIUDB/QTVgNqZx8YptkuIvSGpw8kIywyZg3NKdzGUO8aJJ0NlXapL7e9qQIigkYhdaCZjZFG5zIxdOFs4sVoz/6vnQT9JIcGWy7uS5xiNOulGvfEWU78+e+I9yPdT74RApve5VAVT/km5lV5ldRnwwehLnTx+volUlnOD8rwfizoVLqFTrfRfr4cVMF605UYyaiVxHF50hywFRZoAdVcMEhlLQnQXfz/ZsLMJLJm9eCpjQ989N0oX6theSLCcv7QtHcWMXydjWMcpuTfBZSFrwUVbC23uMOKTJVEWq5LMG3m2L6hP3//2gvUzGhOVLvoGuC+erboB7QoXdcoOgXY+dTZPMcPBxpArdDLWVQSLTvPs05QzpaUdRLVMC/kD1d1EudlEicgkNgNDBhBn3089nVmvKndbKLvj+23a5AQVVbs+8C0x+SJvTc9N2N+bmuH7jIJPrEvWK4xwcQa+g2M/EBv05jaEdSErlVa6B6UKCH0Lea9rpy1se9vn5OzpaaMCCJIpcpQqHDjo0PMAQXBSbqjKcBei6lR5fIFl5UO9gWP1v8PGPuCzGTBivQ92XlgV1TWXmdbJHwIuSbJx3Ali7Wp19RR4E4uHC+TPFssvgkh9ZLkORnWWS35wzzU1LkwWx0="
+          on:
+            tags: true
+            condition: "($SKIP_PUBLISH != true)"

data/CHANGELOG.md

@@ -1,3 +1,50 @@
+### 1.20.1 / 2021-01-08
+* Fixed:
+  * Ensure that yum calls commands appropriately depending on whether or not
+    packages are already installed.
+  * Also change all HostKeyAlgorithms settings for SSH connections
+
+### 1.20.0 / 2021-01-05
+* Added:
+  * A `enable_epel_on` function that follows the instructions on the EPEL
+    website to properly enable EPEL on hosts. May be disabled using
+    `BEAKER_enable_epel=no`.
+  * An Ubuntu nodeset to make sure our default settings don't destroy other
+    Linux systems.
+  * Added has_crypto_policies method for determining if crypto policies are
+    present on the SUT
+  * Added munge_ssh_crypto_policies to allow vagrant to SSH back into systems
+    with restrictive crypto policies (usually FIPS)
+* Fixed:
+  * Modify all crypto-policy backend files to support ssh-rsa keys
+  * Try harder when doing yum installations
+
+### 1.19.4 / 2021-01-05
+* Fixed:
+  * Only return a default empty string when `pfact_on` finds a `nil` value
+    * Added an acceptance test to validate this
+  * Ensure that we start with `facter -p` for `facter` < 4.0 and continue to
+      `puppet facts` otherwise
+  * Updated the Rakefile to skip symlinks in chmods which fixes the ability to
+    build gems
+
+### 1.19.3 / 2021-01-01
+* Fixed:
+  * Ensure that `pfact_on` can handle fact dot notation
+* Changed:
+  * Silenced some of the noisy commands that didn't provide value-add output
+
+### 1.19.2 / 2020-12-19
+* Fixed:
+  * Fixed an issue with pfact_on
+
+### 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

data/Gemfile

@@ -44,7 +44,7 @@ group :system_tests do
   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/Rakefile

@@ -30,7 +30,7 @@ task :chmod do
   gemspec = File.expand_path( "#{@package}.gemspec", @rakefile_dir ).strip
   spec = Gem::Specification::load( gemspec )
   spec.files.each do |file|
-    FileUtils.chmod 'go=r', file
+    FileUtils.chmod 'go=r', file unless File.symlink?(file)
   end
 end
 

data/lib/simp/beaker_helpers.rb

@@ -66,6 +66,8 @@ module Simp::BeakerHelpers
 
     if sut[:hypervisor] == 'docker'
       exclude_list = []
+      opts[:silent] ||= true
+
       if opts.has_key?(:ignore) && !opts[:ignore].empty?
         opts[:ignore].each do |value|
           exclude_list << "--exclude '#{value}'"
@@ -114,9 +116,34 @@ module Simp::BeakerHelpers
 
   # use the `puppet fact` face to look up facts on an SUT
   def pfact_on(sut, fact_name)
-    facts_json = on(sut,'puppet facts find xxx').output
-    facts      = JSON.parse(facts_json).fetch( 'values' )
-    facts.fetch(fact_name)
+    require 'ostruct'
+
+    # If puppet is not installed, there are no puppet facts to fetch
+    if sut.which('puppet').empty?
+      fact_on(sut, fact_name, :silent => true)
+    else
+      facts_json = nil
+      begin
+        cmd_output = on(sut, 'facter -p --json', :silent => true)
+
+        # Facter 4+
+        raise('skip facter -p') if (cmd_output.stderr =~ /no longer supported/)
+
+        facts = JSON.parse(cmd_output.stdout, object_class: OpenStruct)
+      rescue StandardError
+        # If *anything* fails, we need to fall back to `puppet facts`
+
+        facts_json = on(sut, 'puppet facts find garbage_xxx', :silent => true).stdout
+        facts = JSON.parse(facts_json, object_class: OpenStruct).values
+      end
+
+      found_fact = facts.dig(*(fact_name.split('.')))
+
+      # Fall back to the behavior in fact_on
+      found_fact = '' if found_fact.nil?
+
+      return found_fact
+    end
   end
 
   # Returns the modulepath on the SUT, as an Array
@@ -294,6 +321,19 @@ module Simp::BeakerHelpers
     pluginsync_on(suts) if opts[:pluginsync]
   end
 
+  def has_crypto_policies(sut)
+    file_exists_on(sut, '/etc/crypto-policies/config')
+  end
+
+  def munge_ssh_crypto_policies(sut, key_types=['ssh-rsa'])
+    if has_crypto_policies(sut)
+      on(sut, "yum update -y crypto-policies", :accept_all_exit_codes => true)
+
+      # Since we may be doing this prior to having a box flip into FIPS mode, we
+      # need to find and modify *all* of the affected policies
+      on( sut, %{sed --follow-symlinks -i 's/\\(HostKeyAlgorithms\\|PubkeyAcceptedKeyTypes\\)\\(.\\)/\\1\\2#{key_types.join(',')},/g' $( grep -L ssh-rsa $( find /etc/crypto-policies /usr/share/crypto-policies -type f -a \\( -name '*.txt' -o -name '*.config' \\) -exec grep -l PubkeyAcceptedKeyTypes {} \\; ) ) })
+    end
+  end
 
   # Configure and reboot SUTs into FIPS mode
   def enable_fips_mode_on( suts = hosts )
@@ -347,17 +387,14 @@ module Simp::BeakerHelpers
         on(sut, module_install_cmd)
       end
 
-      # Enable FIPS and then reboot to finish.
-      on(sut, %(puppet apply --verbose #{fips_enable_modulepath} -e "class { 'fips': enabled => true }"))
-
       # Work around Vagrant and cipher restrictions in EL8+
       #
       # 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(sut, opensshserver_config)
-        on(sut, "sed --follow-symlinks -i 's/PubkeyAcceptedKeyTypes=/PubkeyAcceptedKeyTypes=ssh-rsa,/' #{opensshserver_config}")
-      end
+      munge_ssh_crypto_policies(sut)
+
+      # Enable FIPS and then reboot to finish.
+      on(sut, %(puppet apply --verbose #{fips_enable_modulepath} -e "class { 'fips': enabled => true }"))
 
       sut.reboot
     end
@@ -450,6 +487,49 @@ module Simp::BeakerHelpers
       repo_manifest = repo_manifest + %(\n#{repo_manifest_opts.join(",\n")}) + "\n}\n"
   end
 
+  # Enable EPEL if appropriate to do so and the system is online
+  #
+  # Can be disabled by setting BEAKER_enable_epel=no
+  def enable_epel_on(sut)
+    if ONLINE && (ENV['BEAKER_stringify_facts'] != 'no')
+      os_info = fact_on(sut, 'os')
+      os_maj_rel = os_info['release']['major']
+
+      # This is based on the official EPEL docs https://fedoraproject.org/wiki/EPEL
+      if ['RedHat', 'CentOS'].include?(os_info['name'])
+        # EL7 returns 1 if install is called and there is nothing to do
+        yum_operation = 'install'
+        yum_operation = 'update' if sut.check_for_package('epel-release')
+
+        on(
+          sut,
+          %{yum #{yum_operation} -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-#{os_maj_rel}.noarch.rpm},
+          :max_retries => 3,
+          :retry_interval => 10
+        )
+
+        if os_info['name'] == 'RedHat'
+          if os_maj_rel == '7'
+            on sut, %{subscription-manager repos --enable "rhel-*-optional-rpms"}
+            on sut, %{subscription-manager repos --enable "rhel-*-extras-rpms"}
+            on sut, %{subscription-manager repos --enable "rhel-ha-for-rhel-*-server-rpms"}
+          end
+
+          if os_maj_rel == '8'
+            on sut, %{subscription-manager repos --enable "codeready-builder-for-rhel-8-#{os_info['architecture']}-rpms"}
+          end
+        end
+
+        if os_info['name'] == 'CentOS'
+          if os_maj_rel == '8'
+            # 8.0 fallback
+            on sut, %{dnf config-manager --set-enabled powertools || dnf config-manager --set-enabled PowerTools}
+          end
+        end
+      end
+    end
+  end
+
   def linux_errata( sut )
     # We need to be able to flip between server and client without issue
     on sut, 'puppet resource group puppet gid=52'
@@ -535,6 +615,7 @@ module Simp::BeakerHelpers
       end
 
       enable_yum_repos_on(sut)
+      enable_epel_on(sut)
 
       # net-tools required for netstat utility being used by be_listening
       if fact_on(sut, 'operatingsystemmajrelease') == '7'
@@ -886,10 +967,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
 
@@ -980,7 +1061,7 @@ done
   # @returns [String] Path to the Hieradata directory on the target system
   def hiera_datadir(sut)
     # This output lets us know where Hiera is configured to look on the system
-    puppet_lookup_info = on(sut, 'puppet lookup --explain test__simp__test').output.strip.lines
+    puppet_lookup_info = on(sut, 'puppet lookup --explain test__simp__test', :silent => true).output.strip.lines
 
     if sut.puppet_configprint['manifest'].nil? || sut.puppet_configprint['manifest'].empty?
       fail("No output returned from `puppet config print manifest` on #{sut}")
@@ -1218,13 +1299,27 @@ done
   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
+    # EL7 returns 1 if install is called and there is nothing to do
+    yum_operation = 'install'
+    yum_operation = 'update' if sut.check_for_package('yum-utils')
 
-    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
+    on(
+      sut,
+      "yum -y #{yum_operation} yum-utils",
+      :max_retries => 3,
+      :retry_interval => 10
+    )
+
+    # EL7 returns 1 if install is called and there is nothing to do
+    yum_operation = 'install'
+    yum_operation = 'update' if sut.check_for_package('simp-release-community')
+
+    on(
+      sut,
+      %{yum -y #{yum_operation} "https://download.simp-project.com/simp-release-community.rpm"},
+      :max_retries => 3,
+      :retry_interval => 10
+    )
 
     to_disable = disable.dup
 
@@ -1244,7 +1339,10 @@ done
       # 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.
-      available_repos = on(sut, %{yum-config-manager --enablerepo="*"}).stdout.lines.grep(/\A\[(.+)\]\Z/){|x| $1}
+      #
+      # 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)
 

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'
 
@@ -17,7 +17,11 @@ module Simp::BeakerHelpers
     require 'open-uri'
 
     begin
-      ONLINE = true if open('http://google.com')
+      if URI.respond_to?(:open)
+        ONLINE = true if URI.open('http://google.com')
+      else
+        ONLINE = true if open('http://google.com')
+      end
     rescue
       ONLINE = false
     end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.19.0'
+  VERSION = '1.20.1'
 end

data/spec/acceptance/nodesets/default.yml

@@ -6,28 +6,27 @@
   end
 -%>
 HOSTS:
-  server-el7:
+  el7:
     roles:
-      - server
-      - master
-      - default
       - el7
+      - master
     platform: el-7-x86_64
     box: centos/7
     hypervisor: <%= hypervisor %>
 
-  server-el6:
+  el8:
     roles:
-      - el6
-    platform: el-6-x86_64
-    box: centos/6
+      - el8
+    platform: el-8-x86_64
+    box: centos/8
     hypervisor: <%= hypervisor %>
 
-  server-el8:
+  el8-0:
     roles:
       - el8
     platform: el-8-x86_64
     box: centos/8
+    box_version: "1905.1"
     hypervisor: <%= hypervisor %>
 
 CONFIG:
@@ -37,3 +36,14 @@ CONFIG:
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
 <% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

data/spec/acceptance/nodesets/ubuntu.yml

@@ -0,0 +1,20 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  focal:
+    platform: ubuntu-20.04-x86_64
+    box: ubuntu/focal64
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  vagrant_memsize: 256
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

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/fixture_modules_spec.rb

@@ -8,15 +8,33 @@ context 'after copy_fixture_modules_to( hosts )' do
 
   describe "fact_on(master,'root_home')" do
     it 'should not return value of `root_home`' do
-      puts fact = fact_on(master, 'root_home')
-      expect( fact ).to eq ''
+      expect(fact_on(master, 'root_home')).to eq ''
     end
   end
 
   describe "pfact_on(master,'root_home')" do
     it 'should return value of `root_home`' do
-      puts fact = pfact_on(master, 'root_home')
-      expect( fact ).to eq '/root'
+      expect(pfact_on(master, 'root_home')).to eq '/root'
+    end
+  end
+
+  describe "pfact_on(master,'os.release.major')" do
+    it 'should return the value of `os.release.major`' do
+      expect(pfact_on(master, 'os.release.major')).to match(/.+/)
+    end
+  end
+
+  describe "pfact_on(master,'os.release.foo')" do
+    it 'should not return the value of `os.release.foo`' do
+      expect(pfact_on(master, 'os.release.foo')).to eq ''
+    end
+  end
+
+  describe "pfact_on(master,'fips_enabled')" do
+    expected = (ENV['BEAKER_fips'] == 'yes')
+
+    it 'should return false' do
+      expect(pfact_on(master, 'fips_enabled')).to eq expected
     end
   end
 end

data/spec/lib/simp/beaker_helpers_spec.rb

@@ -103,19 +103,22 @@ 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_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
+      # Prevent namespace pollution
+      pipe_out,pipe_in = IO.pipe
+      fork do
+        pipe_out.close
+        require 'puppet'
+        pipe_in.write(Puppet.version)
+      end
+      pipe_in.close
+
+      expected_version = pipe_out.gets
+      expected_major_version = expected_version.split('.').first
+
+      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(expected_version)
+      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq("puppet#{expected_major_version}")
+      expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('agent')
     end
 
     it 'extracts info from PUPPET_INSTALL_VERSION for Puppet 5' do
@@ -153,26 +156,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 +181,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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.1
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-01-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"
@@ -187,6 +188,7 @@ files:
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
 - spec/acceptance/nodesets/default.yml
+- spec/acceptance/nodesets/ubuntu.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
@@ -219,7 +221,7 @@ licenses:
 - Apache-2.0
 metadata:
   issue_tracker: https://simp-project.atlassian.net
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -234,8 +236,37 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: beaker helper methods for SIMP
-test_files: []
+test_files:
+- spec/acceptance/nodesets/default.yml
+- spec/acceptance/nodesets/ubuntu.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/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