Merge pull request #654 from mhashizume/PA-5337/main/pe-integration

(PA-5337) PE integration

Author: cthorn42

manifests/params.pp

@@ -61,9 +61,13 @@
       $collection = 'puppet6'
     }
     # pe_version >= 2021.0, use puppet7
-    else {
+    elsif versioncmp($_pe_version, '2023.3') < 0 {
       $collection = 'puppet7'
     }
+    # pe_version >= 2023.3, use puppet8
+    else {
+      $collection = 'puppet8'
+    }
     # The aio puppet-agent version currently installed on the compiling master
     # (only used in PE)
     if is_function_available('pe_compiling_server_aio_build') {

spec/classes/puppet_agent_params_spec.rb

@@ -81,5 +81,17 @@ def sets_collection_to(collection)
 
       it { sets_collection_to('puppet7') }
     end
+
+    context '2023.3 > pe_version >= 2023.0' do
+      let(:facts) { super().merge(custom_fact__pe_version: '2023.0') }
+
+      it { sets_collection_to('puppet7') }
+    end
+
+    context 'pe_version >= 2023.3' do
+      let(:facts) { super().merge(custom_fact__pe_version: '2023.3') }
+
+      it { sets_collection_to('puppet8') }
+    end
   end
 end