simp-beaker-helpers 1.20.1 → 1.23.0

data/lib/simp/beaker_helpers/ssg.rb

@@ -79,7 +79,7 @@ module Simp::BeakerHelpers
         '7' => {
           'required_packages' => EL_PACKAGES,
           'ssg' => {
-            'profile_target' => 'rhel7',
+            'profile_target' => 'centos7',
             'build_target'   => 'centos7',
             'datastream'     => 'ssg-centos7-ds.xml'
           }
@@ -87,7 +87,7 @@ module Simp::BeakerHelpers
         '8' => {
           'required_packages' => EL8_PACKAGES,
           'ssg' => {
-            'profile_target' => 'rhel8',
+            'profile_target' => 'centos8',
             'build_target'   => 'centos8',
             'datastream'     => 'ssg-centos8-ds.xml'
           }
@@ -299,8 +299,26 @@ module Simp::BeakerHelpers
         result_id = rule_result.attributes['idref'].value.to_s
         result_value = [
           'Title: ' + doc.xpath("//Rule[@id='#{result_id}']/title/text()").first.to_s,
-          '  ID: ' + result_id
-        ].join("\n")
+          '  ID: ' + result_id,
+        ]
+
+        if result.child.content == 'fail'
+          references = {}
+
+          doc.xpath("//Rule[@id='#{result_id}']/reference").each do |ref|
+            references[ref['href']] ||= []
+            references[ref['href']] << ref.text
+          end
+
+          result_value << '  References:'
+          references.each_pair do |src, items|
+            result_value << "    *  #{src}"
+            result_value << "      * #{items.join(', ')}"
+          end
+          result_value << '  Description: ' + doc.xpath("//Rule[@id='#{result_id}']/description").text.gsub("\n","\n    ")
+        end
+
+        result_value = result_value.join("\n")
 
         if result.child.content == 'fail'
           stats[:failed] << result_value.red

data/lib/simp/beaker_helpers/version.rb

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

data/lib/simp/rake/beaker.rb

@@ -196,6 +196,7 @@ module Simp::Rake
           default_suite = ordered_suites.delete('default')
           ordered_suites.unshift(default_suite) if default_suite
 
+          suite_start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           ordered_suites.each do |ste|
 
             next unless (suites[ste]['default_run'] == true)
@@ -255,6 +256,11 @@ module Simp::Rake
               $stdout.puts("\n\n=== Suite '#{name}' Complete ===\n\n")
             end
           end
+          suite_end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+          suite_run_time = ((suite_end_time - suite_start_time)/60).round(2)
+
+          $stdout.puts("== Total Runtime: #{suite_run_time} minutes ==\n\n")
 
           unless failures.keys.empty?
             $stdout.puts("The following tests had failures:")

data/simp-beaker-helpers.gemspec

@@ -18,10 +18,14 @@ Gem::Specification.new do |s|
   s.metadata = {
                  'issue_tracker' => 'https://simp-project.atlassian.net'
                }
+
+  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-puppet'               , ['>= 1.18.14', '< 2.0.0']
-  s.add_runtime_dependency 'beaker-docker'               , '~> 0.3'
+  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'

data/spec/acceptance/nodesets/docker.yml

@@ -0,0 +1,60 @@
+HOSTS:
+  el7.test.net:
+    roles:
+      - el7
+      - master
+    platform:   el-7-x86_64
+    hypervisor: docker
+    image: simpproject/simp_beaker_el7
+    docker_cmd: '["/sbin/init"]'
+
+  el8.test.net:
+    roles:
+      - el8
+    platform:   el-8-x86_64
+    hypervisor: docker
+    image: simpproject/simp_beaker_el8
+    docker_cmd: '["/sbin/init"]'
+
+CONFIG:
+  log_level: verbose
+  type: aio
+<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
+  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
+<% end -%>
+  # This is necessary for pretty much all containers
+  docker_cap_add:
+    - AUDIT_WRITE
+<%
+  require 'docker-api'
+  unless ::Docker.podman?
+-%>
+  # All items below this point are required for systemd
+  mount_folders:
+    cgroup:
+      host_path: /sys/fs/cgroup
+      container_path: /sys/fs/cgroup
+      opts: 'ro'
+  dockeropts:
+    HostConfig:
+      Tmpfs:
+        '/run': 'rw,noexec,nosuid,nodev,size=65536k'
+        '/run/lock': 'rw,noexec,nosuid,nodev,size=65536k'
+        '/tmp': 'rw,exec,nosuid,nodev,size=65536k'
+        '/sys/fs/cgroup/systemd': 'rw,size=65536k'
+        '/var/log/journal': 'rw,noexec,nodev,nosuid,size=65536k'
+<% end -%>
+  ssh:
+    password: root
+    auth_methods:
+      - password
+    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/suites/default/check_puppet_version_spec.rb

@@ -5,7 +5,7 @@ hosts.each do |host|
     context "on #{host}" do
       puppet_collection = host.options[:puppet_collection]
 
-      client_puppet_version = on(host, 'puppet --version').output.strip
+      client_puppet_version = on(host, 'puppet --version').stdout.strip
 
       if puppet_collection =~ /puppet(\d+)/
         puppet_collection_version = $1

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

@@ -37,4 +37,10 @@ context 'after copy_fixture_modules_to( hosts )' do
       expect(pfact_on(master, 'fips_enabled')).to eq expected
     end
   end
+
+  describe "pfact_on returns a hash" do
+    it 'should return a Hash' do
+      expect(pfact_on(master, 'os')).to be_a(Hash)
+    end
+  end
 end

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

@@ -1,12 +1,12 @@
 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
+  expect_failures = false
+  if hosts_with_role(hosts, 'el8').include?(host)
+    expect_failures = true
+  end
 
+  describe '#install_simp_repos' do
     it 'should install yum utils' do
       host.install_package('yum-utils')
     end
@@ -21,6 +21,18 @@ hosts.each do |host|
       end
     end
 
+    context 'when targeting a release type' do
+      it 'adjusts the SIMP release target' do
+        set_simp_repo_release(host, 'rolling')
+        expect(file_content_on(host, '/etc/yum/vars/simpreleasetype').strip).to eq('rolling')
+      end
+
+      it 'lists the simp rpm' do
+        skip "#{host} is not supported yet" if expect_failures
+        on(host, 'yum list simp')
+      end
+    end
+
     context 'when passed a disabled list ' do
       before(:all) { install_simp_repos(host, ['simp-community-simp'] ) }
 

data/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-../../nodesets
+spec/acceptance/suites/default/../../nodesets

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

@@ -18,6 +18,7 @@ new_fixtures = {
   }
 }
 
+new_fixtures['fixtures']['repositories']['crypto_policy'] = 'https://github.com/simp/pupmod-simp-crypto_policy'
 new_fixtures['fixtures']['repositories']['fips'] = 'https://github.com/simp/pupmod-simp-fips'
 new_fixtures['fixtures']['repositories']['augeasproviders_core'] = 'https://github.com/simp/augeasproviders_core'
 new_fixtures['fixtures']['repositories']['augeasproviders_grub'] = 'https://github.com/simp/augeasproviders_grub'

data/spec/acceptance/suites/fips_from_fixtures/nodesets

@@ -1 +1 @@
-../../nodesets
+spec/acceptance/suites/fips_from_fixtures/../../nodesets

data/spec/acceptance/suites/snapshot/nodesets

@@ -1 +1 @@
-../../nodesets
+spec/acceptance/suites/snapshot/../../nodesets

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.20.1
+  version: 1.23.0
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -69,16 +69,42 @@ dependencies:
   name: beaker-docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-vagrant
   requirement: !ruby/object:Gem::Requirement
@@ -163,11 +189,15 @@ extra_rdoc_files: []
 files:
 - ".fips_fixtures"
 - ".fixtures.yml"
+- ".github/workflows.local.json"
+- ".github/workflows/pr_glci.yml"
+- ".github/workflows/pr_glci_cleanup.yml"
+- ".github/workflows/pr_glci_manual.yml"
+- ".github/workflows/tag_deploy_rubygem.yml"
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -188,6 +218,7 @@ files:
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
 - spec/acceptance/nodesets/default.yml
+- spec/acceptance/nodesets/docker.yml
 - spec/acceptance/nodesets/ubuntu.yml
 - spec/acceptance/suites/default/check_puppet_version_spec.rb
 - spec/acceptance/suites/default/enable_fips_spec.rb
@@ -221,7 +252,7 @@ licenses:
 - Apache-2.0
 metadata:
   issue_tracker: https://simp-project.atlassian.net
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -229,44 +260,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.6.3
+signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP
-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
+test_files: []

data/.travis.yml

@@ -1,42 +0,0 @@
----
-language: shell
-notifications:
-  email: false
-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)"