Fix derivatives hack (#168)

 Fix derivatives hack

Update the derivatives workaround to insert an inert line instead of
commenting out the previous line to allow for logic updates

* Removed EL8 inspec material - unsure what happened to the upstream repo
* Corrected test title
* Addressed a bug where passing an empty exceptions array would produce
  an invalid xpath query
* Ensure that the new SIMP community RPMs are used

Closes #166
Closes #167

Co-authored-by: Chris Tessmer <[email protected]>

.fixtures.yml

@@ -7,6 +7,3 @@ fixtures:
     disa_stig-el7-baseline:
       repo: https://github.com/mitre/redhat-enterprise-linux-7-stig-baseline
       target: spec/fixtures/inspec_deps/inspec_profiles/profiles
-    disa_stig-el8-baseline:
-      repo: https://github.com/mitre/redhat-enterprise-linux-8-stig-baseline
-      target: spec/fixtures/inspec_deps/inspec_profiles/profiles

.github/workflows/pr_acceptance.yml

@@ -1,5 +1,5 @@
 # Run all tests as GitHub Actions
-name: Unit Tests
+name: Acceptance Tests
 on:
   push:
     branches:

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 1.24.2 / 2022-02-20
+* Fixed:
+  * Update the derivatives workaround to insert an inert line instead of
+    commenting out the previous line to allow for logic updates
+  * Addressed a bug where passing an empty exceptions array would produce an
+    invalid xpath query
+  * Ensure that the new SIMP community RPMs are used
+
 ### 1.24.1 / 2021-10-27
 * Fixed:
   * Worked around a bug in 'puppet lookup' - PUP-11402

lib/simp/beaker_helpers.rb

@@ -1498,10 +1498,12 @@ def install_simp_repos(suts, disable = [])
     block_on(suts, :run_in_parallel => parallel) do |sut|
       install_package_unless_present_on(sut, 'yum-utils')
 
+      release = fact_on(sut, 'os.release.major')
+
       install_package_unless_present_on(
         sut,
         'simp-release-community',
-        "https://download.simp-project.com/simp-release-community.rpm",
+        "https://download.simp-project.com/simp-release-community.el#{release}.rpm"
       )
 
       to_disable = disable.dup

lib/simp/beaker_helpers/inspec.rb

@@ -34,9 +34,7 @@ def self.enable_repo_on(suts)
     #   The name of the profile against which to run
     #
     def initialize(sut, profile)
-      # The 4.41 release is currently broken
-      # @inspec_version = ENV['BEAKER_inspec_version'] || 'latest'
-      @inspec_version = ENV['BEAKER_inspec_version'] || '4.39.0'
+      @inspec_version = ENV['BEAKER_inspec_version'] || 'latest'
 
       @sut = sut
 

lib/simp/beaker_helpers/ssg.rb

@@ -278,9 +278,8 @@ def self.process_ssg_results(result_file, filter=nil, exclusions=nil)
 
         xpath_query << ')' if filter.size > 1
 
-        if exclusions
-          exclusions = Array(exclusions)
-
+        exclusions = Array(exclusions)
+        unless exclusions.empty?
           xpath_query << 'and not('
 
           xpath_query << exclusions.map do |exl|
@@ -419,7 +418,7 @@ def get_ssg_datastream
         #
         # 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/#ssg.build_derivatives.profile_handling/g' enable_derivatives.py))
+        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))
 
         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

lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.24.1'
+  VERSION = '1.24.2'
 end