beaker 4.37.1 → 4.37.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0d409c6cd07fc46ac641d68560cfe5ab40515df89f1a15bf6521b9f3bc044d9
-  data.tar.gz: e4d0909c8e1cb8190d35e740ee5c954f9e50241b4e763f416ed2d1374c92d2c2
+  metadata.gz: 94de428f52b80007b5443a3694bfba1c6cf8fb694373a760ba825d0b044117bb
+  data.tar.gz: 0d28d5a725253b87ca396639767778f1a70d143094b94049a60616d7e7accd0d
 SHA512:
-  metadata.gz: 45402a7f027808b4a3b3b7e797cf6fcdfb620d3dd7af45e0e07771fb289c21f7bb65265698a1225eeac15629542738cd0e1f67ae5dfd29bb1e1abeef9f5db554
-  data.tar.gz: 48f6623ca4b0f61dd737f1ef16d1258558aa238ba57bbf8596cd69b3403d5b3883d8d89977d73fd637c526b5665fe12d03af3fd68d38c37d646031cffac506d0
+  metadata.gz: 73f8ec5ae3893fe1b99b08515eac624b1531505c2793d507837a30e5bd0a6d87196fee04828d291e1c8bb1f2ab8dc3b158864270aa75a50d43a3759019ddbb94
+  data.tar.gz: c81de7019a75a1532ec4ae1b52826c93bc3cfee7060ee52948c364be6ae50174177743bea06edd52b6cbd0866ed3d501d34c686bfe1c0e2c94ae9edfb4915a7b

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.37.2](https://github.com/voxpupuli/beaker/tree/4.37.2) (2022-07-28)
+
+## Fixed
+
+- Use the new scheme for agent versions >= 6.28 and < 7 [\#1749](https://github.com/voxpupuli/beaker/pull/1749) ([joshcooper](https://github.com/joshcooper))
+
 ## [4.37.1](https://github.com/voxpupuli/beaker/tree/4.37.1) (2022-07-27)
 
 ## Fixed

data/lib/beaker/host/mac/pkg.rb

@@ -121,7 +121,9 @@ module Mac::Pkg
 
     # macOS puppet-agent tarballs haven't always included arch
     agent_version = opts[:puppet_agent_version]
-    download_file = if agent_version && (agent_version.to_f < 6.28 || agent_version.to_f < 7.18)
+    agent_version_f = agent_version&.to_f
+
+    download_file = if agent_version_f.nil? || (agent_version_f < 6.28 || (agent_version_f >= 7.0 && agent_version_f < 7.18))
                       "puppet-agent-#{variant}-#{version}.tar.gz"
                     else
                       "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.37.1'
+    STRING = '4.37.2'
   end
 end

data/spec/beaker/host/mac_spec.rb

@@ -82,5 +82,32 @@ module Mac
         expect( release_path_end ).to be === "apple/PC8"
       end
     end
+
+    describe '#pe_puppet_agent_promoted_package_info' do
+      before :each do
+        @platform = "osx-10.15-x86_64"
+      end
+
+      it "uses the old scheme if the version is omitted" do
+        _, _, download_file = host.pe_puppet_agent_promoted_package_info('pa_collection')
+
+        expect(download_file).to eq('puppet-agent-osx-10.15.tar.gz')
+      end
+
+      {
+        '5.5.22' => 'puppet-agent-osx-10.15.tar.gz',
+        '6.27.0' => 'puppet-agent-osx-10.15.tar.gz',
+        '6.28.0' => 'puppet-agent-osx-10.15-x86_64.tar.gz',
+        '7.0.0'  => 'puppet-agent-osx-10.15.tar.gz',
+        '7.18.0' => 'puppet-agent-osx-10.15-x86_64.tar.gz',
+        '8.0.0'  => 'puppet-agent-osx-10.15-x86_64.tar.gz',
+      }.each_pair do |version, expected|
+        it "returns #{expected} for puppet-agent #{version}" do
+          _, _, download_file = host.pe_puppet_agent_promoted_package_info('pa_collection', puppet_agent_version: version)
+
+          expect(download_file).to eq(expected)
+        end
+      end
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.37.1
+  version: 4.37.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec