simp-beaker-helpers 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20611993c0b38c821da287d01266302a5de462fce9dc91005f249675da5e0454
-  data.tar.gz: c069784a8d04644b1bf52c476b57cbb4d0432774ae87dabef8167387fd51bc08
+  metadata.gz: 3916923de88666ed3a88a41f3053dca5791fb456d6386121c6a85c40641113e6
+  data.tar.gz: f1ebb8c0b1c9faf276537948cf31432305715921476132e4c39fff0411a36c79
 SHA512:
-  metadata.gz: 6ce1b8cdd761a7893576d97403e0b6860fb626528f0fc6c64aad17c06029225f764b31f9648f4c60d7b0de96fde63e16cf8f2b5261e9ac2c9d05801919f13609
-  data.tar.gz: 99d9c3085ee58c56f8650bdd0708d81fdb2fc128f3d114afd31883533b058345edeadb46307b537341b294cf7a317d5ef3484d7b073f95726b918b850ae1a6cc
+  metadata.gz: d639af43846bb7c711d42348f035e096c54afcc1b7a8e6db537412dbee093d5d2618e2f329a8fd95865d5514d59d2ecc0d33842334d1d1978e1f984e65b92497
+  data.tar.gz: 3b77cd3c5403c706a4198e8cc95465e504aac01640e5e614a6bf3aa1b8390a5e0a9e8a170852c9448f7738cf38ecdbb1299e84b02a770b3ac215946493809d36

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 2.0.4 / 2025-10-16
+* Fixed:
+  * `install_puppet` failure on Windows (#266)
+
+### 2.0.3 / 2025-10-07
+* Fixed:
+  * Removed outdated/incorrect errata for Windows machines (#261)
+
 ### 2.0.2 / 2025-08-12
 * Fixed:
   * Updated dependencies to allow beaker >= 7.0.0 (#239)

data/lib/simp/beaker_helpers/version.rb

@@ -4,5 +4,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '2.0.2'
+  VERSION = '2.0.4'
 end

data/lib/simp/beaker_helpers.rb

@@ -937,38 +937,8 @@ module Simp::BeakerHelpers
     linux_errata(linux_suts) unless linux_suts.empty?
 
     unless windows_suts.empty?
-      block_on(windows_suts, run_in_parallel: @run_in_parallel) do |sut|
-        # Load the Windows requirements
-        require 'simp/beaker_helpers/windows'
-
-        # Install the necessary windows certificate for testing
-        #
-        # https://petersouter.xyz/testing-windows-with-beaker-without-cygwin/
-        geotrust_global_ca = <<~EOM.freeze
-        -----BEGIN CERTIFICATE-----
-        MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-        MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-        YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-        EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-        R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-        9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-        fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-        iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-        1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-        bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-        MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-        ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-        uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-        Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-        tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-        PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-        hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-        5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
-        -----END CERTIFICATE-----
-        EOM
-
-        install_cert_on_windows(sut, 'geotrustglobal', geotrust_global_ca)
-      end
+      # There are currently no known Windows errata to apply
+      STDERR.puts '== SKIPPING Windows errata (none known)' if ENV['BEAKER_helpers_verbose']
     end
 
     # Configure and reboot SUTs into FIPS mode
@@ -1489,9 +1459,14 @@ module Simp::BeakerHelpers
 
   def run_puppet_install_helper_on(hosts)
     block_on hosts, run_in_parallel: true do |host|
-      BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, ENV['BEAKER_PUPPET_COLLECTION'])
-      package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.collection2packagename(host, ENV['BEAKER_PUPPET_COLLECTION']))
-      host.install_package(package_name)
+      puppet_collection = ENV.fetch('BEAKER_PUPPET_COLLECTION', nil) || host.options['puppet_collection']
+      if is_windows?(host)
+        install_msi_on(host, puppet_collection)
+      else
+        BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, puppet_collection)
+        package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.collection2packagename(host, puppet_collection))
+        host.install_package(package_name)
+      end
     end
   end
 

metadata

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