(PE-41548) Add PE 2023.8.6 and 2025.6.0 support (#618)

davidmalloncares · web-flow · commit 31f2a1ad3a99 · 2025-09-24T13:47:57.000+01:00
Merging past the CI failures - they seems to be down to the provisioners and the GCP nodes that do get provisioned becoming unreachable during the tests. Manual testing combined with the few CI tests that did run successfully have given me confidence to proceed with the merge.
diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [standard, large, extra-large]
-        version: [2021.7.9, 2023.8.5, 2025.5.0]
+        version: [2021.7.9, 2023.8.6, 2025.6.0]
         image: [almalinux-cloud/almalinux-8]
     steps:
       - name: Checkout Source
diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml
@@ -14,7 +14,7 @@ on:
       version:
         description: PE version to install
         required: true
-        default: 2023.8.5
+        default: 2023.8.6
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [standard, standard-with-dr, large, extra-large]
-        version: [2023.8.5, 2025.5.0]
+        version: [2023.8.6, 2025.6.0]
         image: [almalinux-cloud/almalinux-8]
     steps:
       - name: Checkout Source
diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml
@@ -14,7 +14,7 @@ on:
       version:
         description: PE version to install
         required: true
-        default: 2023.8.5
+        default: 2023.8.6
       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
@@ -24,14 +24,14 @@ on:
       version:
         description: PE version to install
         required: true
-        default: 2025.5.0
+        default: 2025.6.0
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
         default: 'false'
 jobs:
   backup-restore-test:
-    name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.5.0' }}\
+    name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.6.0' }}\
       \ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}"
     runs-on: ubuntu-latest
     env:
diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml
@@ -14,7 +14,7 @@ on:
       version_to_upgrade:
         description: PE version to upgrade to
         required: false
-        default: 2023.8.5
+        default: 2023.8.6
       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
@@ -37,7 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [standard-with-dr, large, extra-large-with-dr]
-        version: [2021.7.9, 2023.8.5, 2025.5.0]
+        version: [2021.7.9, 2023.8.6, 2025.6.0]
         image: [rhel-8]
         fips: [enable]
     steps:
diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [standard-with-dr, large, extra-large-with-dr]
-        version: [2021.7.9, 2023.8.5, 2025.5.0]
+        version: [2021.7.9, 2023.8.6, 2025.6.0]
         image: [almalinux-cloud/almalinux-8]
     steps:
       - name: Checkout Source
diff --git a/.github/workflows/test-install-rhel-9.yaml b/.github/workflows/test-install-rhel-9.yaml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [standard-with-dr, large, extra-large-with-dr]
-        version: [2021.7.9, 2023.8.5, 2025.5.0]
+        version: [2021.7.9, 2023.8.6, 2025.6.0]
         image: [rhel-9]
     steps:
       - name: Checkout Source
diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml
@@ -14,7 +14,7 @@ on:
       version:
         description: PE version to install
         required: true
-        default: 2023.8.5
+        default: 2023.8.6
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
diff --git a/.github/workflows/test-legacy-compilers.yaml b/.github/workflows/test-legacy-compilers.yaml
@@ -99,7 +99,7 @@ jobs:
             --modulepath spec/fixtures/modules \
             architecture=large-with-dr \
             console_password=${{ secrets.CONSOLE_PASSWORD }} \
-            version=2025.5.0
+            version=2025.6.0
       - name: Wait as long as the file ${HOME}/pause file is present
         if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
         run: |
diff --git a/.github/workflows/test-legacy-upgrade.yaml b/.github/workflows/test-legacy-upgrade.yaml
@@ -152,7 +152,7 @@ jobs:
           compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | head -n 1)
           legacy_compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | sed -n 2p)
           replica=$(yq '.groups[].targets[] | select(.vars.role == "replica") | .name' spec/fixtures/litmus_inventory.yaml)
-          echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.5.0"}' > upgrade_params.json
+          echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.6.0"}' > upgrade_params.json
       - name: Upgrade PE with legacy compilers
         run: |
           echo ::group::upgrade_params.json
diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml
@@ -43,30 +43,30 @@ jobs:
           - extra-large
           - large-with-dr
           - extra-large-with-dr
-        version: [2021.7.9, 2023.8.5, 2025.5.0]
+        version: [2021.7.9, 2023.8.6, 2025.6.0]
         image: [almalinux-cloud/almalinux-8]
         include:
           - architecture: standard
-            version: 2023.8.5
+            version: 2023.8.6
             image: almalinux-cloud/almalinux-8
-            new_pe_version: 2025.5.0
+            new_pe_version: 2025.6.0
           - architecture: large
-            version: 2023.8.5
+            version: 2023.8.6
             image: almalinux-cloud/almalinux-8
-            new_pe_version: 2025.5.0
+            new_pe_version: 2025.6.0
           - architecture: extra-large
-            version: 2023.8.5
+            version: 2023.8.6
             image: almalinux-cloud/almalinux-8
-            new_pe_version: 2025.5.0
+            new_pe_version: 2025.6.0
          # excluding the following combinations as due to their long running nature they always fail due to 
          # the test nodes in GCP that litmus provisions becoming unreachable after a time. If we address PE-40902
          # to change how we provision test nodes in CI then we will hopefully be able to include these
         exclude:
           - architecture: extra-large-with-dr
-            version: 2023.8.5
+            version: 2023.8.6
             image: almalinux-cloud/almalinux-8
           - architecture: extra-large-with-dr
-            version: 2025.5.0
+            version: 2025.6.0
             image: almalinux-cloud/almalinux-8
     steps:
       - name: Checkout Source
diff --git a/.github/workflows/test-replace-failed-postgresql.yaml b/.github/workflows/test-replace-failed-postgresql.yaml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         architecture: [extra-large-with-dr-and-spare-replica]
         install_architecture: [extra-large-with-dr]
-        version: [2021.7.9, 2023.8.5, 2025.5.0]
+        version: [2021.7.9, 2023.8.6, 2025.6.0]
         image: [almalinux-cloud/almalinux-8]
     steps:
       - name: Checkout Source
diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml
@@ -23,7 +23,7 @@ on:
         type: string
         required: true
         description: The initial version of PE to install before upgrade
-        default: 2023.8.5
+        default: 2023.8.6
       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
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [extra-large-with-dr]
-        version: [2023.8.5]
+        version: [2023.8.6]
         image: [almalinux-cloud/almalinux-8]
     steps:
       - name: Checkout Source
diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml
@@ -37,19 +37,17 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [standard, extra-large]  # removing xl-with dr until PE-40902 is addressed
-        version: [2021.7.9, 2023.8.5]
-        version_to_upgrade: [2021.7.9, 2023.8.5, 2025.5.0]
+        version: [2021.7.9, 2023.8.6]
+        version_to_upgrade: [2021.7.9, 2023.8.6, 2025.6.0]
         image: [almalinux-cloud/almalinux-8]
         download_mode: [direct]
         exclude:
           - version: 2021.7.9
             version_to_upgrade: 2021.7.9
-          - version: 2021.7.9
-            version_to_upgrade: 2025.5.0
-          - version: 2023.8.5
+          - version: 2023.8.6
             version_to_upgrade: 2021.7.9
-          - version: 2023.8.5
-            version_to_upgrade: 2023.8.5
+          - version: 2023.8.6
+            version_to_upgrade: 2023.8.6
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml
@@ -26,7 +26,7 @@ on:
       upgrade_version:
         description: PE version to upgrade to
         required: true
-        default: 2023.8.5
+        default: 2023.8.6
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -2287,7 +2287,7 @@ Data type: `Peadm::Pe_version`
 
 
 
-Default value: `'2023.8.5'`
+Default value: `'2023.8.6'`
 
 ##### <a name="-peadm--install--dns_alt_names"></a>`dns_alt_names`
 
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 = '2025.5'
+  $newest = '2025.6'
   $supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))
 
   if $permit_unsafe_versions {
diff --git a/plans/install.pp b/plans/install.pp
@@ -46,7 +46,7 @@
 
   # Common Configuration
   String                            $console_password,
-  Peadm::Pe_version                 $version                          = '2023.8.5',
+  Peadm::Pe_version                 $version                          = '2023.8.6',
   Optional[Stdlib::HTTPSUrl]        $pe_installer_source              = undef,
   Optional[Array[String]]           $dns_alt_names                    = undef,
   Optional[String]                  $compiler_pool_address            = undef,
diff --git a/spec/plans/subplans/install_spec.rb b/spec/plans/subplans/install_spec.rb
@@ -87,11 +87,11 @@
     expect(run_plan('peadm::subplans::install', params)).to be_ok
   end
 
-  it 'installs 2023.8.5 with legacy compilers' do
+  it 'installs 2023.8.6 with legacy compilers' do
     params = {
       'primary_host' => 'primary',
       'console_password' => 'puppetLabs123!',
-      'version' => '2023.8.5',
+      'version' => '2023.8.6',
       'legacy_compilers' => ['compiler1', 'compiler2'],
     }
     expect(run_plan('peadm::subplans::install', params)).to be_ok
