simp-beaker-helpers 1.20.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3223751413072f7e62097c273b72fa130bcc083701b418c5927bd97897a9f9c5
-  data.tar.gz: 89c0620294618b21000ff2b79504df5bbe27f199b0bd4eb17ed69ce987d12899
+  metadata.gz: 7fc677903ad549041397ba842f11a2861c5e99b0b6c9717e0ac48e61485b6a7a
+  data.tar.gz: 824a685974d1bb8df8ba9335d1176c4ea281d77f79d7ecc76c3fd68b88a82a79
 SHA512:
-  metadata.gz: 9179b27932ec80ecfddb09eb4ea2ba778c99513e31d341d7a85606f63ed85e152af7686b90f5e0a46ee11c50dd5aafe300f148069d6d4a87515fdb7e034fa8ed
-  data.tar.gz: a05d10fdcdc609bcc9e2886b19f856304b8b2386d0377ad0680c0d712a1d6fdad2619908267fc196f55dfaa5339452abc1638d428431d4ce4171689b017519d3
+  metadata.gz: 31f997ddbe976bdfbc8fd904a7f8db3a972c6cfb47b62db12483fef311d1eb550caa2fd643e6abaf6dadd92063c288edb9217b472564b3c74af170f828449680
+  data.tar.gz: 7e3a00581115a489502e13f542246aed81be117d104df938b4097e086300649a732c9d6e9094a3e6696cf35b24a30b63a10df9db71158d298a88919530a9bc8d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.20.1 / 2021-01-08
+* Fixed:
+  * Ensure that yum calls commands appropriately depending on whether or not
+    packages are already installed.
+  * Also change all HostKeyAlgorithms settings for SSH connections
+
 ### 1.20.0 / 2021-01-05
 * Added:
   * A `enable_epel_on` function that follows the instructions on the EPEL

data/lib/simp/beaker_helpers.rb

@@ -331,7 +331,7 @@ module Simp::BeakerHelpers
 
       # Since we may be doing this prior to having a box flip into FIPS mode, we
       # need to find and modify *all* of the affected policies
-      on( sut, %{sed --follow-symlinks -i 's/PubkeyAcceptedKeyTypes\\(.\\)/PubkeyAcceptedKeyTypes\\1#{key_types.join(',')},/' $( grep -L ssh-rsa $( find /etc/crypto-policies /usr/share/crypto-policies -type f -a \\( -name '*.txt' -o -name '*.config' \\) -exec grep -l PubkeyAcceptedKeyTypes {} \\; ) ) })
+      on( sut, %{sed --follow-symlinks -i 's/\\(HostKeyAlgorithms\\|PubkeyAcceptedKeyTypes\\)\\(.\\)/\\1\\2#{key_types.join(',')},/g' $( grep -L ssh-rsa $( find /etc/crypto-policies /usr/share/crypto-policies -type f -a \\( -name '*.txt' -o -name '*.config' \\) -exec grep -l PubkeyAcceptedKeyTypes {} \\; ) ) })
     end
   end
 
@@ -497,9 +497,13 @@ module Simp::BeakerHelpers
 
       # This is based on the official EPEL docs https://fedoraproject.org/wiki/EPEL
       if ['RedHat', 'CentOS'].include?(os_info['name'])
+        # EL7 returns 1 if install is called and there is nothing to do
+        yum_operation = 'install'
+        yum_operation = 'update' if sut.check_for_package('epel-release')
+
         on(
           sut,
-          %{yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-#{os_maj_rel}.noarch.rpm},
+          %{yum #{yum_operation} -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-#{os_maj_rel}.noarch.rpm},
           :max_retries => 3,
           :retry_interval => 10
         )
@@ -1295,23 +1299,27 @@ done
   def install_simp_repos(sut, disable = [])
     # NOTE: Do *NOT* use puppet in this method since it may not be available yet
 
-    if on(sut, 'rpm -q yum-utils', :accept_all_exit_codes => true).exit_code != 0
-      on(
-        sut,
-        'yum -y install yum-utils',
-        :max_retries => 3,
-        :retry_interval => 10
-      )
-    end
-
-    if on(sut, 'rpm -q simp-release-community', :accept_all_exit_codes => true).exit_code != 0
-      on(
-        sut,
-        'yum -y install "https://download.simp-project.com/simp-release-community.rpm"',
-        :max_retries => 3,
-        :retry_interval => 10
-      )
-    end
+    # EL7 returns 1 if install is called and there is nothing to do
+    yum_operation = 'install'
+    yum_operation = 'update' if sut.check_for_package('yum-utils')
+
+    on(
+      sut,
+      "yum -y #{yum_operation} yum-utils",
+      :max_retries => 3,
+      :retry_interval => 10
+    )
+
+    # EL7 returns 1 if install is called and there is nothing to do
+    yum_operation = 'install'
+    yum_operation = 'update' if sut.check_for_package('simp-release-community')
+
+    on(
+      sut,
+      %{yum -y #{yum_operation} "https://download.simp-project.com/simp-release-community.rpm"},
+      :max_retries => 3,
+      :retry_interval => 10
+    )
 
     to_disable = disable.dup
 

data/lib/simp/beaker_helpers/version.rb

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

metadata

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