(PE-36203) Updating supported to 2023.2 and default to 2021.7.4 (#363)

ragingra · web-flow · commit cf53522bd73c · 2023-06-26T08:59:55.000+01:00
To come in line with latest PE and STS, I've updated the supported version and the default version.

Also updated tests to run against these versions
diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml
@@ -15,7 +15,7 @@ on:
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.7.3'
+        default: '2021.7.4'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml
@@ -15,7 +15,7 @@ on:
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.7.3'
+        default: '2021.7.4'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-backup-restore.yaml b/.github/workflows/test-backup-restore.yaml
@@ -15,7 +15,7 @@ on:
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.7.3'
+        default: '2021.7.4'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml
@@ -15,7 +15,7 @@ on:
       version_to_upgrade:
         description: 'PE version to upgrade to'
         required: false
-        default: '2021.7.3'
+        default: '2021.7.4'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-fips-install-matrix.yaml b/.github/workflows/test-fips-install-matrix.yaml
@@ -45,7 +45,7 @@ jobs:
         version:
           - 2019.8.12
           - 2021.7.2
-          - 2023.1.0
+          - 2023.2.0
         image:
           - rhel-8
         fips:
diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
@@ -44,8 +44,8 @@ jobs:
           - extra-large-with-dr
         version:
           - 2019.8.12
-          - 2021.7.3
-          - 2023.1.0
+          - 2021.7.4
+          - 2023.2.0
         image:
           - centos-7
           - almalinux-cloud/almalinux-8
diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml
@@ -15,7 +15,7 @@ on:
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.7.3'
+        default: '2021.7.4'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml
@@ -24,7 +24,7 @@ on:
         type: string
         required: true
         description: 'The initial version of PE to install before upgrade'
-        default: '2021.7.3'
+        default: '2021.7.4'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
@@ -19,7 +19,7 @@ jobs:
         architecture:
           - 'extra-large-with-dr'
         version:
-          - '2021.7.3'
+          - '2021.7.4'
         image:
           - 'almalinux-cloud/almalinux-8'
 
diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml
@@ -45,7 +45,7 @@ jobs:
         version:
           - '2019.8.12'
         version_to_upgrade:
-          - '2021.7.3'
+          - '2021.7.4'
         image:
           - 'almalinux-cloud/almalinux-8'
         download_mode:
diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml
@@ -27,7 +27,7 @@ on:
       upgrade_version:
         description: 'PE version to upgrade to'
         required: true
-        default: '2021.7.3'
+        default: '2021.7.4'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -1665,7 +1665,7 @@ Data type: `Peadm::Pe_version`
 
 
 
-Default value: `'2021.7.3'`
+Default value: `'2021.7.4'`
 
 ##### <a name="-peadm--install--dns_alt_names"></a>`dns_alt_names`
 
diff --git a/documentation/upgrade.md b/documentation/upgrade.md
@@ -6,11 +6,11 @@ Puppet Enterprise deployments provisioned using the peadm module can also be upg
 
 The `peadm::upgrade` plan requires as input the version of PE to upgrade to, and the names of each PE infrastructure host. Primary, replica, compilers, etc.
 
-The following is an example parameters file for upgrading an Extra Large architecture deployment of PE 2021.0.1 to PE 2021.7.3.
+The following is an example parameters file for upgrading an Extra Large architecture deployment of PE 2021.0.1 to PE 2021.7.4.
 
 ```json
 {
-  "version": "2021.7.3",
+  "version": "2021.7.4",
   "primary_host": "pe-master-09a40c-0.us-west1-a.c.reidmv-peadm.internal",
   "primary_postgresql_host": "pe-psql-09a40c-0.us-west1-a.c.reidmv-peadm.internal",
   "replica_host": "pe-master-09a40c-1.us-west1-b.c.reidmv-peadm.internal",
diff --git a/functions/assert_supported_pe_version.pp b/functions/assert_supported_pe_version.pp
@@ -6,7 +6,7 @@ function peadm::assert_supported_pe_version (
   Boolean $permit_unsafe_versions = false,
 ) >> Struct[{ 'supported' => Boolean }] {
   $oldest = '2019.7'
-  $newest = '2023.1'
+  $newest = '2023.2'
   $supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))
 
   if $permit_unsafe_versions {
diff --git a/plans/install.pp b/plans/install.pp
@@ -39,7 +39,7 @@
 
   # Common Configuration
   String                            $console_password,
-  Peadm::Pe_version                 $version                          = '2021.7.3',
+  Peadm::Pe_version                 $version                          = '2021.7.4',
   Optional[String]                  $pe_installer_source              = undef,
   Optional[Array[String]]           $dns_alt_names                    = undef,
   Optional[String]                  $compiler_pool_address            = undef,
diff --git a/spec/functions/assert_supported_pe_version_spec.rb b/spec/functions/assert_supported_pe_version_spec.rb
@@ -19,7 +19,7 @@
     end
 
     it 'accepts the newest supported version' do
-      is_expected.to run.with_params('2021.7.3').and_return({ 'supported' => true })
+      is_expected.to run.with_params('2021.7.4').and_return({ 'supported' => true })
     end
 
     it 'accepts a version in the middle' do
diff --git a/spec/plans/convert_spec.rb b/spec/plans/convert_spec.rb
@@ -19,7 +19,7 @@
     allow_apply
 
     expect_task('peadm::cert_data').return_for_targets('primary' => trustedjson)
-    expect_task('peadm::read_file').always_return({ 'content' => '2021.7.3' })
+    expect_task('peadm::read_file').always_return({ 'content' => '2021.7.4' })
 
     # For some reason, expect_plan() was not working??
     allow_plan('peadm::modify_certificate').always_return({})
diff --git a/spec/plans/upgrade_spec.rb b/spec/plans/upgrade_spec.rb
@@ -28,7 +28,7 @@ def allow_standard_non_returning_calls
 
     expect(run_plan('peadm::upgrade',
                     'primary_host' => 'primary',
-                    'version' => '2021.7.3')).to be_ok
+                    'version' => '2021.7.4')).to be_ok
   end
 
   it 'runs with a primary, compilers, but no replica' do
@@ -41,7 +41,7 @@ def allow_standard_non_returning_calls
     expect(run_plan('peadm::upgrade',
                     'primary_host' => 'primary',
                     'compiler_hosts' => 'compiler',
-                    'version' => '2021.7.3')).to be_ok
+                    'version' => '2021.7.4')).to be_ok
   end
 
   it 'fails if the primary uses the pcp transport' do
