simp-beaker-helpers 1.23.4 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a8f3a3f4dc773c215796e464031e1ab00ed025c9a3346fd4573d12a1a072fd9
-  data.tar.gz: 1d55ad88ebae56afe2e807ad1a27d3e6ee5828499ef2f3655770b71f8660d579
+  metadata.gz: 4403e18b35abbd1622d13e0fac49c4c22a20bf6b80b142b9db9fb5743a96bdf0
+  data.tar.gz: a490a356a2e18cda7611213d53e0202a3790377e722cd23d56228766d93351a5
 SHA512:
-  metadata.gz: 10d292eb75b4bcd9d2bfc2bc5223367ea2706db88cdc29d016b37db9864530d6a923e56339d1f37a5b4e9b9cf1edeb34c179d73d5a56361416145a363c02890e
-  data.tar.gz: f877ae87cf79c64786aeaf800cb1d8b839ad251c80664e128b498a7e555d9661a7034e677d1682bcbc91fb8ce00ba504f5ed22035ad6ed877df45d0c8851b241
+  metadata.gz: 9d9ab525dd5345fac7fb7c66fb8aab2c8449b6fce2e5812518a4341d8bdbd5a208e5a31c5b12fc912e664f1f4dbb11fb41419576eddd1fe09844f4aaa8af4cf2
+  data.tar.gz: 26a688025f283009ba338823369e26a2d65db16db212592ab9fe3432f3c1892b251ec176c1c0faa6a5f7abab727c4d2d25994c8af316a199027279a4ffec02d1

data/.github/workflows/pr_glci.yml

@@ -63,7 +63,7 @@ jobs:
   # we restrict ourselves to sending data elsewhere.
   glci-syntax:
     name: '.gitlab-ci.yml Syntax'
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     outputs:
       valid: ${{ steps.validate-glci-file.outputs.valid }}
     steps:
@@ -174,7 +174,7 @@ jobs:
 ###  examine_contexts:
 ###    name: 'Examine Context contents'
 ###    if: always()
-###    runs-on: ubuntu-16.04
+###    runs-on: ubuntu-latest
 ###    needs: [ glci-syntax, contributor-permissions ]
 ###    steps:
 ###      - name: Dump contexts

data/.github/workflows/pr_glci_cleanup.yml

@@ -93,7 +93,7 @@ jobs:
 ###  examine_contexts:
 ###    name: 'Examine Context contents'
 ###    if: always()
-###    runs-on: ubuntu-16.04
+###    runs-on: ubuntu-latest
 ###    steps:
 ###      - name: Dump contexts
 ###        env:

data/.github/workflows/tag_deploy_rubygem.yml

@@ -1,4 +1,4 @@
-# Build & Deploy RubyGem & GitHub release when a SemVer tag is pushed
+# When SemVer tag is pushed: create GitHub release & publish gem to rubygems.org
 #
 # This workflow's jobs are only triggered in repos under the `simp` organization
 # ------------------------------------------------------------------------------

data/.gitlab-ci.yml

@@ -273,10 +273,6 @@ variables:
 # Unit Tests
 #-----------------------------------------------------------------------
 
-pup5.x-unit:
-  <<: *pup_5_x
-  <<: *unit_tests
-
 pup6.x-unit:
   <<: *pup_6_x
   <<: *unit_tests
@@ -292,12 +288,6 @@ pup7.x-unit:
 #=======================================================================
 # Packaging test
 
-pup5.x-pkg:
-  <<: *pup_5_x
-  <<: *unit_tests
-  script:
-    'bundle exec rake pkg:gem'
-
 pup6.x-pkg:
   <<: *pup_6_x
   <<: *unit_tests

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 1.24.0 / 2021-10-05
+* Fixed:
+  * Pinned the version of inspec to 4.39.0 since 4.41 broke tag processing
+  * Only call `activate_interfaces` once per test run instead of at each context
+    which saves quite a bit of time during testing
+  * SSG tag selection logic
+  * Use `sed -ci` which works with docker volume mounts
+* Added:
+  * Modified the `activate_interfaces` method to use the `networking` fact if
+    available which shaves quite a bit of time off of each test run
+
 ### 1.23.4 / 2021-07-07
 * Fixed:
   * Ensure that the openscap-scanner package is installed during SSG runs

data/Gemfile

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

data/files/pki/make.sh

@@ -73,7 +73,7 @@ for hosts in $*; do
       done
     done
 
-    sed -i "s/# subjectAltName = #ALTNAMES#/subjectAltName = ${altnames}/" "working/${hname}.cnf"
+    sed -ci "s/# subjectAltName = #ALTNAMES#/subjectAltName = ${altnames}/" "working/${hname}.cnf"
   fi
 
   echo "-- running openssl req"

data/lib/simp/beaker_helpers/inspec.rb

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

data/lib/simp/beaker_helpers/ssg.rb

@@ -407,7 +407,7 @@ module Simp::BeakerHelpers
         else
           tags = on(@sut, %(cd scap-content; git tag -l)).output
           target_tag = tags.lines.map(&:strip)
-            .select{|x| x.start_with?(/v\d+\./)}
+            .select{|x| x.match?(/^v(\d+\.)+\d+$/)}
             .sort.last
 
           on(@sut, %(cd scap-content; git checkout #{target_tag}))
@@ -419,7 +419,7 @@ 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 -i '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/#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

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.23.4'
+  VERSION = '1.24.0'
 end

data/lib/simp/beaker_helpers.rb

@@ -483,7 +483,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 -i '/Ciphers /d' /etc/ssh/sshd_config))
+      on(sut, %(sed -ci '/Ciphers /d' /etc/ssh/sshd_config))
       on(sut, %(echo 'Ciphers #{fips_ssh_ciphers.join(',')}' >> /etc/ssh/sshd_config))
 
       fips_enable_modulepath = ''
@@ -688,7 +688,7 @@ module Simp::BeakerHelpers
       if current_domain.empty?
         new_fqdn = hostname + '.beaker.test'
 
-        on(sut, "sed -i 's/#{hostname}.*/#{new_fqdn} #{hostname}/' /etc/hosts")
+        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)
 
@@ -953,21 +953,31 @@ module Simp::BeakerHelpers
       host_entry[fqdn] << host.name if (host[:hypervisor] == 'docker')
 
       # Ensure that all interfaces are active prior to collecting data
-      activate_interfaces(host) unless ENV['BEAKER_no_fix_interfaces']
+      activate_interfaces(host)
 
-      # Gather the IP Addresses for the host to embed in the cert
-      interfaces = fact_on(host, 'interfaces').strip.split(',')
-      interfaces.each do |interface|
-        ipaddress = fact_on(host, "ipaddress_#{interface}")
+      networking_fact = pfact_on(host, 'networking')
+      if networking_fact && networking_fact['interfaces']
+        networking_fact['interfaces'].each do |iface, data|
+          next unless data['ip']
+          next if data['ip'].start_with?('127.')
 
-        next if ipaddress.nil? || ipaddress.empty? || ipaddress.start_with?('127.')
+          host_entry[fqdn] << data['ip'].strip
+        end
+      else
+        # Gather the IP Addresses for the host to embed in the cert
+        interfaces = fact_on(host, 'interfaces').strip.split(',')
+        interfaces.each do |interface|
+          ipaddress = fact_on(host, "ipaddress_#{interface}")
 
-        host_entry[fqdn] << ipaddress.strip
+          next if ipaddress.nil? || ipaddress.empty? || ipaddress.start_with?('127.')
 
-        unless host_entry[fqdn].empty?
-          suts_network_info[fqdn] = host_entry[fqdn].sort.uniq
+          host_entry[fqdn] << ipaddress.strip
         end
       end
+
+      unless host_entry[fqdn].empty?
+        suts_network_info[fqdn] = host_entry[fqdn].sort.uniq
+      end
     end
 
     # Get all of the repeated SUT IP addresses:
@@ -1072,7 +1082,6 @@ module Simp::BeakerHelpers
     on ca_sut, "chgrp -R puppet #{host_keydist_dir}"
   end
 
-
   # Activate all network interfaces on the target system
   #
   # This is generally needed if the upstream vendor does not activate all
@@ -1080,6 +1089,8 @@ module Simp::BeakerHelpers
   #
   # Can be passed any number of hosts either singly or as an Array
   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|
       if host[:platform] =~ /windows/
@@ -1087,14 +1098,22 @@ module Simp::BeakerHelpers
         next
       end
 
-      interfaces_fact = pfact_on(host, 'interfaces')
+      networking_fact = pfact_on(host, 'networking')
+      if networking_fact && networking_fact['interfaces']
+        networking_fact['interfaces'].each do |iface, data|
+          next if ( ( data['ip'] && !data['ip'].empty? ) || ( data['ip6'] && !data['ip6'].empty? ) )
+          on(host, "ifup #{iface}", :accept_all_exit_codes => true)
+        end
+      else
+        interfaces_fact = pfact_on(host, 'interfaces')
 
-      interfaces = interfaces_fact.strip.split(',')
-      interfaces.delete_if { |x| x =~ /^lo/ }
+        interfaces = interfaces_fact.strip.split(',')
+        interfaces.delete_if { |x| x =~ /^lo/ }
 
-      interfaces.each do |iface|
-        if pfact_on(host, "ipaddress_#{iface}")
-          on(host, "ifup #{iface}", :accept_all_exit_codes => true)
+        interfaces.each do |iface|
+          if pfact_on(host, "ipaddress_#{iface}")
+            on(host, "ifup #{iface}", :accept_all_exit_codes => true)
+          end
         end
       end
     end
@@ -1111,12 +1130,9 @@ module Simp::BeakerHelpers
   RSpec.configure do |c|
     c.before(:all) do
       @temp_hieradata_dirs = @temp_hieradata_dirs || []
-    end
 
-    # We can't guarantee that the upstream vendor isn't disabling interfaces so
-    # we need to turn them on at each context run
-    c.before(:context) do
-      activate_interfaces(hosts) unless ENV['BEAKER_no_fix_interfaces']
+      # We can't guarantee that the upstream vendor isn't disabling interfaces
+      activate_interfaces(hosts)
     end
 
     c.after(:all) do

data/spec/acceptance/nodesets/default.yml

@@ -32,7 +32,7 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 256
+  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,7 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 512
+  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,7 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 256
+  vagrant_memsize: 512
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
 <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.23.4
+  version: 1.24.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker