simp-beaker-helpers 1.26.1 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b361d19ffb83f7ce149363e948e0e9580d6c85c378638bbaff77d6252d36f1e1
-  data.tar.gz: edaf5e05b246e96ea81e33c588c9c3d71d7e1f610ef5f782e0d02be6dc2c5816
+  metadata.gz: 893037080c5711de66388dabf435c509163179798e9dd79d1f842a45e1ab4cc2
+  data.tar.gz: be745da1931e76ba7ec1ee393da84563ef7b35f7aaf915b52a4d73228490db1c
 SHA512:
-  metadata.gz: 63232d87cc0b63deef62fbb61964aa0cd2a60935ea5a2746c76cecf2d261601c89b8703e36325052c9243bdee4f023e2591b7dcc8b8354b13cbe0f03c3881d4c
-  data.tar.gz: c2019a1a3aa4fc7b2b4d10e00e1fd87318926c55e9e3572892d24f2b314c37bbdbba7f56ac8fdf20948cf1674a133cf85c82d3366372d8460114ed1e83f7ab0f
+  metadata.gz: f6abb6b44e5489fe7d18111076140f560959076c79815fce68793346353a0d60d8071cc67407376c1f4a2d033d363100efc77f6a7ef6cca877a44ef699623402
+  data.tar.gz: d03bbcb53b3f74d8f3d907b878cc46b7991057e18a179257342bf9533f96216e5374d16066095f7e80e08df381576641b87d7f7d5c8a3dcb8826040f7266663a

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 1.28.0 / 2022-08-05
+* Added:
+  * Support RHEL versions without RHN credentials
+    * Supports pay-as-you-go cloud services
+
+### 1.27.0 / 2022-07-30
+* Added:
+  * Add EPEL support for Amazon, Rocky, and Alma distributions
+
+### 1.26.2 / 2022-07-26
+* Fixed:
+  * Limit the length of the CN field of the certificates to 64 bytes
+
 ### 1.26.1 / 2022-06-24
 * Fixed:
   * Ensure that `multi_node` is enabled by default for backwards compatibility

data/files/pki/make.sh

@@ -46,7 +46,7 @@ for hosts in $*; do
   echo "-- $hname"
   mkdir -p "${keydist}/${hname}/cacerts"
 
-  sed -e "s/#HOSTNAME#/${hname}/" template_host.cnf > "working/${hname}.cnf"
+  sed -e "s/#HOSTNAME#/${hname:0:63}/" template_host.cnf > "working/${hname}.cnf"
 
   if [ "$hname" != "$hosts" ];
   then

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.26.1'
+  VERSION = '1.28.0'
 end

data/lib/simp/beaker_helpers.rb

@@ -636,14 +636,14 @@ module Simp::BeakerHelpers
 
         # This is based on the official EPEL docs https://fedoraproject.org/wiki/EPEL
         case os_info['name']
-        when 'RedHat','CentOS'
+        when 'RedHat','CentOS','AlmaLinux','Rocky'
           install_latest_package_on(
             sut,
             'epel-release',
             "https://dl.fedoraproject.org/pub/epel/epel-release-latest-#{os_maj_rel}.noarch.rpm",
           )
 
-          if os_info['name'] == 'RedHat'
+          if os_info['name'] == 'RedHat' && ENV['BEAKER_RHSM_USER'] && ENV['BEAKER_RHSM_PASS']
             if os_maj_rel == '7'
               on sut, %{subscription-manager repos --enable "rhel-*-optional-rpms"}
               on sut, %{subscription-manager repos --enable "rhel-*-extras-rpms"}
@@ -655,7 +655,7 @@ module Simp::BeakerHelpers
             end
           end
 
-          if os_info['name'] == 'CentOS'
+          if ['CentOS','AlmaLinux','Rocky'].include?(os_info['name'])
             if os_maj_rel == '8'
               # 8.0 fallback
               install_latest_package_on(sut, 'dnf-plugins-core')
@@ -665,8 +665,9 @@ module Simp::BeakerHelpers
         when 'OracleLinux'
           package_name = "oracle-epel-release-el#{os_maj_rel}"
           install_latest_package_on(sut,package_name)
+        when 'Amazon'
+          on sut, %{amazon-linux-extras install epel -y}
         end
-
       end
     end
   end
@@ -773,12 +774,19 @@ module Simp::BeakerHelpers
           end
         end
 
-        if ['CentOS','RedHat','OracleLinux'].include?(os_info['name'])
+        if [
+            'AlmaLinux',
+            'Amazon',
+            'CentOS',
+            'OracleLinux',
+            'RedHat',
+            'Rocky'
+        ].include?(os_info['name'])
           enable_yum_repos_on(sut)
           enable_epel_on(sut)
 
           # net-tools required for netstat utility being used by be_listening
-          if os_info['release']['major'].to_i >= 7
+          if (os_info['release']['major'].to_i >= 7) ||((os_info['name'] == 'Amazon') && (os_info['release']['major'].to_i >= 2))
             pp = <<-EOS
               package { 'net-tools': ensure => installed }
             EOS
@@ -828,7 +836,8 @@ module Simp::BeakerHelpers
 
       if os == 'RedHat'
         unless rhsm_opts[:username] && rhsm_opts[:password]
-          fail("You must set BEAKER_RHSM_USER and BEAKER_RHSM_PASS environment variables to register RHEL systems")
+          warn("BEAKER_RHSM_USER and/or BEAKER_RHSM_PASS not set on RHEL system.", "Assuming that subscription-manager is not needed. This may prevent packages from installing")
+          return
         end
 
         sub_status = on(sut, 'subscription-manager status', :accept_all_exit_codes => true)
@@ -866,24 +875,30 @@ module Simp::BeakerHelpers
   end
 
   def rhel_repo_enable(suts, repos)
-    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
-      Array(repos).each do |repo|
-        on(sut, %{subscription-manager repos --enable #{repo}})
+    if ENV['BEAKER_RHSM_USER'] && ENV['BEAKER_RHSM_PASS']
+      block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
+        Array(repos).each do |repo|
+          on(sut, %{subscription-manager repos --enable #{repo}})
+        end
       end
     end
   end
 
   def rhel_repo_disable(suts, repos)
-    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
-      Array(repos).each do |repo|
-        on(sut, %{subscription-manager repos --disable #{repo}}, :accept_all_exit_codes => true)
+    if ENV['BEAKER_RHSM_USER'] && ENV['BEAKER_RHSM_PASS']
+      block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
+        Array(repos).each do |repo|
+          on(sut, %{subscription-manager repos --disable #{repo}}, :accept_all_exit_codes => true)
+        end
       end
     end
   end
 
   def rhel_rhsm_unsubscribe(suts)
-    block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
-      on(sut, %{subscription-manager unregister}, :accept_all_exit_codes => true)
+    if ENV['BEAKER_RHSM_USER'] && ENV['BEAKER_RHSM_PASS']
+      block_on(suts, :run_in_parallel => @run_in_parallel) do |sut|
+        on(sut, %{subscription-manager unregister}, :accept_all_exit_codes => true)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.26.1
+  version: 1.28.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker