beaker-pe 3.2.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e1e3ee7449a81df4a5fecfdbf683c4714ae82739074879524840ef3853e3985
-  data.tar.gz: 8cc1a9ed940acc35e3d80326510a8e75720312cb868a0ff73ae79f8851539e56
+  metadata.gz: 7f708fe43bba20734cab90b60ce41be2beeaa37f8abcd06442e675bf457f14d7
+  data.tar.gz: a01ef6d73351dcaa87ce709268d8f1c2416f5731a91d1282cb9521be4144faa1
 SHA512:
-  metadata.gz: d3c48ca519266a175533ae8572eb8940104e514690f0e4655d4788d6ed957d2a55e0eedefca6561a34e191fb253ad94d3a52d9c65533534b2e5ea656cba88b03
-  data.tar.gz: ed00460ff4f7c5d93096e578557c6f99c277575c11ca3637a51d59fdb45f42ada1d58669390b9d027e6d7fb4b4ad3f7a39e132457f53311ceeeabdb7196d99d8
+  metadata.gz: 30aeb8bac7f4fce50d8dc1ffb07ffb22544914c446836298312ec5aea8b545b60296f248a12ef48c9f4f407367b4d5652e475e42ad13e922f05d8ba6273bde62
+  data.tar.gz: 6b1cf7b6a3950812266b5916a78556470e4df54bbfd1657ad3453cff0c9f5712b6c72331d08b35d84d2c27a8c15a81f9ef6a8beef3ba45e687e3865e9a137c11

data/CHANGELOG.md

@@ -1,8 +1,56 @@
 # Changelog
 
-## [3.0.1](https://github.com/puppetlabs/beaker-pe/tree/3.0.1) (2024-04-08)
+## [3.3.1](https://github.com/puppetlabs/beaker-pe/tree/3.3.1) (2024-12-05)
 
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.0...3.0.1)
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.3.0...3.3.1)
+
+**Implemented enhancements:**
+
+- \(maint\): Added support for v2 agent download url [\#283](https://github.com/puppetlabs/beaker-pe/pull/283) ([span786](https://github.com/span786))
+
+## [3.3.0](https://github.com/puppetlabs/beaker-pe/tree/3.3.0) (2024-06-21)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.19.0...3.3.0)
+
+## [2.19.0](https://github.com/puppetlabs/beaker-pe/tree/2.19.0) (2024-06-21)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.2.0...2.19.0)
+
+**Implemented enhancements:**
+
+- \(PE-38685\) Beaker 6 upgrade [\#281](https://github.com/puppetlabs/beaker-pe/pull/281) ([tlehman](https://github.com/tlehman))
+
+## [3.2.0](https://github.com/puppetlabs/beaker-pe/tree/3.2.0) (2024-06-11)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.18.0...3.2.0)
+
+## [2.18.0](https://github.com/puppetlabs/beaker-pe/tree/2.18.0) (2024-06-11)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.1.0...2.18.0)
+
+**Implemented enhancements:**
+
+- \(PE-38522\) Add install\_puppet\_agent\_pe\_promoted\_repo\_on [\#277](https://github.com/puppetlabs/beaker-pe/pull/277) ([tlehman](https://github.com/tlehman))
+
+## [3.1.0](https://github.com/puppetlabs/beaker-pe/tree/3.1.0) (2024-05-22)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.17.0...3.1.0)
+
+**Merged pull requests:**
+
+- \(PE-37784\) Remove upper bound for beaker-puppet [\#273](https://github.com/puppetlabs/beaker-pe/pull/273) ([nmburgan](https://github.com/nmburgan))
+
+## [2.17.0](https://github.com/puppetlabs/beaker-pe/tree/2.17.0) (2024-04-10)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.1...2.17.0)
+
+## [3.0.1](https://github.com/puppetlabs/beaker-pe/tree/3.0.1) (2024-04-10)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.16.1...3.0.1)
+
+## [2.16.1](https://github.com/puppetlabs/beaker-pe/tree/2.16.1) (2024-03-19)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.0...2.16.1)
 
 **Implemented enhancements:**
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    beaker-pe (3.2.0)
-      beaker (>= 4.0, < 6)
+    beaker-pe (3.3.0)
+      beaker (>= 4.0, < 7)
       beaker-abs
       beaker-answers (~> 1.0)
       beaker-puppet (>= 1)

data/beaker-pe.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thin'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '>= 4.0', '< 6'
+  s.add_runtime_dependency 'beaker', '>= 4.0', '< 7'
   s.add_runtime_dependency 'beaker-puppet', '>=1'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'beaker-answers', '~> 1.0'

data/lib/beaker-pe/install/pe_utils.rb

@@ -342,7 +342,7 @@ module Beaker
           extension = ".rpm"
           host.install_package_with_rpm("#{path}/#{filename}#{extension}")
         end
- 
+
         #Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
         #Assumed file name format: puppet-enterprise-3.3.0-rc1-559-g97f0833.msi
         # @param [Host] host The windows host to download/upload and unpack PE onto
@@ -1076,7 +1076,11 @@ module Beaker
             pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0.0-rc1'
             opts = sanitize_opts(opts)
             opts[:download_url] =
-              "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos"
+              if Gem::Version.new(pe_ver) > Gem::Version.new('2023.7.0')
+                "#{opts[:pe_promoted_builds_url]}/v2/agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos"
+              else
+                "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos"
+              end
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= host.external_copy_base
             opts[:puppet_collection] ||= puppet_collection_for(:puppet_agent, opts[:puppet_agent_version])

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '3.2.0'
+        STRING = '3.3.1'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -165,7 +165,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: beaker-puppet
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Beaker PE DSL Helpers!