Merge branch 'main' into MAINT-provisioner-testing

Author: davidmalloncares

.github/workflows/test-add-compiler-matrix.yml

@@ -33,7 +33,7 @@ jobs:
       BOLT_DISABLE_ANALYTICS: true
       LANG: en_US.UTF-8
       PUPPET_FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_API_TOKEN }}
-      BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: forge-key:${{ secrets.PUPPET_FORGE_API_TOKEN }}      
+      BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: forge-key:${{ secrets.PUPPET_FORGE_API_TOKEN }}
     strategy:
       fail-fast: false
       matrix:

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [v3.33.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.33.0) - 2025-10-06
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.32.0...v3.33.0)
+
+### Added
+
+- (PE-42498) Update to support Bolt v5 [#623](https://github.com/puppetlabs/puppetlabs-peadm/pull/623) ([davidmalloncares](https://github.com/davidmalloncares))
+
 ## [v3.32.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.32.0) - 2025-09-24
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.31.0...v3.32.0)

Gemfile

@@ -55,6 +55,7 @@ end
 puppet_version = ENV['PUPPET_GEM_VERSION']
 facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
+bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)
 
 gems = {}
 

functions/assert_supported_bolt_version.pp

@@ -6,14 +6,16 @@
 function peadm::assert_supported_bolt_version (
   # No arguments
 ) >> Struct[{ 'supported' => Boolean }] {
-  $supported_bolt_version = '>= 3.17.0 < 5.0.0'
+  $supported_bolt_version = '>= 3.17.0 < 6.0.0'
+  $current_bolt_version = peadm::bolt_version()
   $supported = (peadm::bolt_version() =~ SemVerRange($supported_bolt_version))
+
 # lint:ignore:strict_indent
   unless $supported {
     fail(@("REASON"/L))
       This version of puppetlabs-peadm requires Bolt version ${supported_bolt_version}.
 
-      You are using Bolt version ${peadm::bolt_version()}.
+      You are using Bolt version ${current_bolt_version}.
 
       Please make sure you have a compatible Bolt version and try again.
 

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-peadm",
-  "version": "3.32.0",
+  "version": "3.33.0",
   "author": "puppetlabs",
   "summary": "Bolt plans used to deploy an at-scale Puppet Enterprise architecture",
   "license": "Apache-2.0",