beaker-puppet 4.0.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37f61fccae5c08bae5c7653b34c25b505cbd4962093f1508852dd2bf578d003b
-  data.tar.gz: 419309478e2bab667ccea4ee45f1c023cad6723f80a6b3874ce323cfc4bac9cc
+  metadata.gz: 80809eece9510728e0df53d115dbd5601db09afa6167708f5fcd4416851c3509
+  data.tar.gz: c453e2ac087860996bb6939d1cdf445059bdf917b45e5011c9d493f769567cc7
 SHA512:
-  metadata.gz: 60d06296bad76fa5a08317f4d439044ec16d52fa661aad6e5d3a8e3b6bb412fbe3a463d28d32d410e233a33d543dbae055acd48e7bbc24ea369f0e75d39248d5
-  data.tar.gz: d34b27685bef1bce10eb0ddb0e5102af3a9b8fb54b0611553e402891460a318f9e452bc8a6876487c79264d64e7b9c5e322aaa2421a825b40fe110c0edd12d47
+  metadata.gz: 8aa43c7e5ebb881befb1614601de7cad2accae18d0022950f554a0bc6bd95f8fc88f1ce5c6e631c89e2f5994f9c979971df4034dc9362676e3224fbb5b597323
+  data.tar.gz: c8aefb063e1d536d7819a33e80c4eeea4b8eb148504fc10ff068704214b9df9b1a62961c097737369e82b707c5ccb4470bbb4f95ae134c043c4f5bb3b1949e17

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.1.1](https://github.com/puppetlabs/beaker-puppet/tree/4.1.1) (2024-05-31)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/4.1.0...4.1.1)
+
+**Implemented enhancements:**
+
+- \[PA-6886\]: Add DigiCertGlobalRootG2 to Solaris image [\#260](https://github.com/puppetlabs/beaker-puppet/pull/260)
+
+## [4.1.0](https://github.com/puppetlabs/beaker-puppet/tree/4.1.0) (2024-05-31)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/4.0.0...4.1.0)
+
+**Implemented enhancements:**
+
+- Add support for Ubuntu 24.04 [\#257](https://github.com/puppetlabs/beaker-puppet/pull/257) ([joshcooper](https://github.com/joshcooper))
+
 ## [4.0.0](https://github.com/puppetlabs/beaker-puppet/tree/4.0.0) (2024-05-28)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/3.0.1...4.0.0)
@@ -59,6 +75,14 @@ All notable changes to this project will be documented in this file.
 - Bump actions/checkout from 3 to 4 [\#227](https://github.com/puppetlabs/beaker-puppet/pull/227) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Update voxpupuli-rubocop requirement from ~\> 1.2 to ~\> 2.0 [\#226](https://github.com/puppetlabs/beaker-puppet/pull/226) ([dependabot[bot]](https://github.com/apps/dependabot))
 
+## [2.1.0](https://github.com/puppetlabs/beaker-puppet/tree/2.1.0) (2024-03-19)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/2.0.0...2.1.0)
+
+**Implemented enhancements:**
+
+- \[PA-6181\]: Fix acceptance test failure caused due to addition of Amazon Linux 2023 in pe-client-tools for orchestrator client pipeline [\#250](https://github.com/puppetlabs/beaker-puppet/pull/250) ([span786](https://github.com/span786))
+
 ## [2.0.0](https://github.com/puppetlabs/beaker-puppet/tree/2.0.0) (2023-05-05)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/1.29.0...2.0.0)

data/lib/beaker-puppet/install_utils/puppet5.rb

@@ -217,7 +217,12 @@ module Beaker
 
           install_targets.each do |host|
             artifact_url, repoconfig_url = host_urls(host, build_details, base_url)
-            if repoconfig_url.nil?
+            if host.platform.variant == 'ubuntu' && host.platform.version.to_f >= 24.04
+              # install the specific artifact we built, not based on how its repos are configured
+              tmp_file = host.tmpfile('puppet-agent')
+              on(host, "curl -L --output #{tmp_file} #{artifact_url}")
+              host.install_local_package(tmp_file)
+            elsif repoconfig_url.nil?
               install_artifact_on(host, artifact_url, project_name)
             else
               install_repo_configs_on(host, repoconfig_url)

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '4.0.0'
+  VERSION = '4.1.1'
 end

data/setup/common/003_solaris_cert_fix.rb

@@ -40,6 +40,31 @@ DigiCert = <<~EOM
   -----END CERTIFICATE-----
 EOM
 
+DigiCertG2 = <<-STRING
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
+MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
+2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
+1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
+q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
+tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
+vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
+5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
+1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
+NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
+Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
+8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
+pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+STRING
+
 USERTrust = <<~EOM
   -----BEGIN CERTIFICATE-----
   MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
@@ -79,6 +104,10 @@ hosts.each do |host|
   on(host, 'chmod a+r /root/DigiCert_Trusted_Root_G4.pem')
   on(host, 'cp -p /root/DigiCert_Trusted_Root_G4.pem /etc/certs/CA/')
   on(host, 'rm /root/DigiCert_Trusted_Root_G4.pem')
+  create_remote_file(host, 'DigiCert_Trusted_Root_G2.pem', DigiCertG2)
+  on(host, 'chmod a+r /root/DigiCert_Trusted_Root_G2.pem')
+  on(host, 'cp -p /root/DigiCert_Trusted_Root_G2.pem /etc/certs/CA/')
+  on(host, 'rm /root/DigiCert_Trusted_Root_G2.pem')
 
   if host.platform =~ /solaris-11-sparc/
     create_remote_file(host, 'USERTrust_RSA_Certification_Authority.pem', USERTrust)

data/spec/beaker-puppet/install_utils/puppet5_spec.rb

@@ -12,7 +12,7 @@ end
 describe ClassMixedWithDSLInstallUtils do
   let(:hosts) do
     make_hosts({ pe_ver: '3.0',
-                 platform: 'linux',
+                 platform: Beaker::Platform.new('redhat-9-x86_64'),
                  roles: ['agent'],
                  type: 'foss', }, 4)
   end
@@ -363,6 +363,23 @@ describe ClassMixedWithDSLInstallUtils do
       end.to raise_error(Beaker::DSL::Outcomes::FailTest, /project_name.*#{sha_yaml_url}/)
     end
 
+    it 'installs the artifact on newer Ubuntu hosts' do
+      artifact_url = 'https://builds.example.com/puppet-agent.deb'
+      project_name = 'fake_project_66'
+      allow(subject).to receive(:fetch_build_details)
+      allow(subject).to receive(:configure_type_defaults_on)
+      allow(subject).to receive(:host_urls) { [artifact_url, ''] }
+
+      hosts = [make_host('host.example.com', platform: Beaker::Platform.new('ubuntu-24.04-x86_64'))]
+      allow(subject).to receive(:hosts).and_return(hosts)
+      hosts.each do |host|
+        allow(host).to receive(:tmpfile).and_return('/tmp/puppet-agent.GcHvLR')
+        allow(subject).to receive(:on).with(host, /^curl/)
+        expect(host).to receive(:install_local_package).with('/tmp/puppet-agent.GcHvLR')
+      end
+      subject.install_from_build_data_url(project_name, 'sha_yaml_url')
+    end
+
     it 'runs host.install_package instead of #install_artifact_on if theres a repo_config' do
       repoconfig_url = 'pants/man/shoot/to/the/stars'
       project_name = 'fake_project_66'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs