(PA-5337) Update PE mappings for puppet8

This commit adds mappings for Puppet Enterprise 2023.3 to puppet8.

Additionally, this removes mappings of PE to puppet-agent < 6, as
they are not supported as standalone versions nor as versions from
which to upgrade to a supported puppet-agent.

Author: mhashizume

manifests/params.pp

@@ -48,22 +48,18 @@
   if $_is_pe {
     # Calculate the default collection
     $_pe_version = pe_build_version()
-    # Not PE or pe_version < 2018.1.3, use PC1
-    if ($_pe_version == undef or versioncmp($_pe_version, '2018.1.3') < 0) {
-      $collection = 'PC1'
-    }
-    # 2018.1.3 <= pe_version < 2018.2, use puppet5
-    elsif versioncmp($_pe_version, '2018.2') < 0 {
-      $collection = 'puppet5'
-    }
-    # 2018.2 <= pe_version < 2021.0 use puppet6
-    elsif versioncmp($_pe_version, '2021.0') < 0 {
+    # pe_version < 2021.0 use puppet6
+    if versioncmp($_pe_version, '2021.0') < 0 {
       $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

@@ -40,24 +40,6 @@ def sets_collection_to(collection)
       is_expected.to contain_notify(notify_title).with_message(collection)
     end
 
-    context 'pe_version < 2018.1.3' do
-      let(:facts) { super().merge(custom_fact__pe_version: '2018.1.2') }
-
-      it { sets_collection_to('PC1') }
-    end
-
-    context 'pe_version == 2018.1.3' do
-      let(:facts) { super().merge(custom_fact__pe_version: '2018.1.3') }
-
-      it { sets_collection_to('puppet5') }
-    end
-
-    context '2018.1.3 < pe_version < 2018.2' do
-      let(:facts) { super().merge(custom_fact__pe_version: '2018.1.5') }
-
-      it { sets_collection_to('puppet5') }
-    end
-
     context 'pe_version == 2018.2' do
       let(:facts) { super().merge(custom_fact__pe_version: '2018.2') }
 
@@ -81,5 +63,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