simp-beaker-helpers 1.23.2 → 1.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd8d6cfc126259b0d2062a8c63765eb67e1645a46d8fd5bdc4605455d4e10bb
-  data.tar.gz: 006e29f01522f454f0ccc84caa3f9ae22405f6034bfaf074080ceb1bec6a9008
+  metadata.gz: 88ab91d8bd2eef77e691c0d864999426ba1321f866decc3a867075535fe23c7b
+  data.tar.gz: 1bf21a9614c1b814ebf80059e60b00c80defd6cc4733bbd421ce6a2620d9e744
 SHA512:
-  metadata.gz: c094cfa4b6d883bbf83a463a646d2a03b9b543f7fcccca64d9afe72d35a9f7c22112500071f96a150eead084f1ffc0dda7a6cd3be78f2da7ddcf04dc1565ccab
-  data.tar.gz: d22878a97daf38ed771e4d2a023ef4edcdf69edaaee8e0ce9d282cd944010f78e27a90ae5dffdf524a98ccf2a359e8356c6bbfbaa81c99e33cfc0b7b740a7222
+  metadata.gz: 3ebba34024934a95b6e2b343bbdc0bb56859a686d20c9a7053d3ffdeedd528260379a7ba82a5b5dd1914d661f46eb1e64b48aef4ee84e88e5181754a5fc151b9
+  data.tar.gz: 5a69d66af5c521f0ec19c52dc1501ab5731f54155b9b23ff64b6d145dff18f05e8bfbb154410c2b2e3282da6c639f05a61b4d42f515d55b36166094d8dfecac3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.23.3 / 2021-06-30
+* Fixed:
+  * Removed the Streams kernel update for EL 8.3 since it now causes issues
+  * Use `pfact_on` to select the interface facts to fix Puppet 7 issues
+
 ### 1.23.2 / 2021-05-29
 * Fixed:
   * Fail an acceptance test when an explicitly-specified nodeset for an

data/lib/simp/beaker_helpers.rb

@@ -248,7 +248,7 @@ module Simp::BeakerHelpers
       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 = retry_on(sut, 'puppet facts find garbage_xxx', :silent => true, :max_retries => 4).stdout
         facts = JSON.parse(facts_json)['values']
       end
 
@@ -771,15 +771,6 @@ module Simp::BeakerHelpers
             apply_manifest_on(sut, pp, :catch_failures => false)
           end
 
-          unless sut[:hypervisor] == 'docker'
-            if (os_info['name'] == 'CentOS') && (os_info['release']['major'].to_i >= 8)
-              if os_info['release']['minor'].to_i == 3
-                update_package_from_centos_stream(sut, 'kernel')
-                sut.reboot
-              end
-            end
-          end
-
           # Clean up YUM prior to starting our test runs.
           on(sut, 'yum clean all')
         end
@@ -1096,13 +1087,13 @@ module Simp::BeakerHelpers
         next
       end
 
-      interfaces_fact = retry_on(host,'facter interfaces', verbose: true).stdout
+      interfaces_fact = pfact_on(host, 'interfaces')
 
       interfaces = interfaces_fact.strip.split(',')
       interfaces.delete_if { |x| x =~ /^lo/ }
 
       interfaces.each do |iface|
-        if fact_on(host, "ipaddress_#{iface}").strip.empty?
+        if pfact_on(host, "ipaddress_#{iface}")
           on(host, "ifup #{iface}", :accept_all_exit_codes => true)
         end
       end

data/lib/simp/beaker_helpers/ssg.rb

@@ -38,7 +38,8 @@ module Simp::BeakerHelpers
       'python3',
       'python3-jinja2',
       'python3-lxml',
-      'python3-pyyaml'
+      'python3-pyyaml',
+      'libarchive'
     ]
 
     OS_INFO = {
@@ -94,6 +95,16 @@ module Simp::BeakerHelpers
           }
         }
       },
+      'Rocky' => {
+        '8' => {
+          'required_packages' => EL8_PACKAGES,
+          'ssg' => {
+            'profile_target' => 'centos8',
+            'build_target'   => 'centos8',
+            'datastream'     => 'ssg-centos8-ds.xml'
+          }
+        }
+      },
       'OracleLinux' => {
         '7' => {
           'required_packages' => EL_PACKAGES,
@@ -136,7 +147,7 @@ module Simp::BeakerHelpers
       end
 
       OS_INFO[@os][@os_rel]['required_packages'].each do |pkg|
-        @sut.install_package(pkg)
+        install_latest_package_on(@sut, pkg)
       end
 
       @output_dir = File.absolute_path('sec_results/ssg')

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.23.2'
+  VERSION = '1.23.3'
 end

data/spec/acceptance/nodesets/default.yml

@@ -18,7 +18,7 @@ HOSTS:
     roles:
       - el8
     platform: el-8-x86_64
-    box: centos/8
+    box: generic/centos8
     hypervisor: <%= hypervisor %>
 
   el8-0:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.23.2
+  version: 1.23.3
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker