(PE-39612) update default PE version to 2021.7.9 and 2023.8.0 (#488)

- Updated default PE version in various GitHub workflow YAML files. - Updated example parameters in documentation files. - Adjusted supported PE version range in assert_supported_pe_version function. - Modified unit tests to reflect the new default PE version.
puppetlabs · Sep 3, 2024 · b488582 · b488582
1 parent ab9db39
commit b488582
Show file tree

Hide file tree

Showing 20 changed files with 94 additions and 130 deletions.
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.8'
+        default: '2021.7.9'
       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.8'
+        default: '2021.7.9'
       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.8'
+        default: '2021.7.9'
       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
@@ -1,73 +1,60 @@
 ---
-name: "Install fips test matrix"
-
+name: Install fips test matrix
 on:
   pull_request:
     paths:
-      - ".github/workflows/**/*"
-      - "spec/**/*"
-      - "lib/**/*"
-      - "tasks/**/*"
-      - "functions/**/*"
-      - "types/**/*"
-      - "plans/**/*"
-      - "hiera/**/*"
-      - "manifests/**/*"
-      - "templates/**/*"
-      - "files/**/*"
-      - "metadata.json"
-      - "Rakefile"
-      - "Gemfile"
-      - "provision.yaml"
-      - ".rspec"
-      - ".rubocop.yml"
-      - ".puppet-lint.rc"
-      - ".fixtures.yml"
+      - .github/workflows/**/*
+      - spec/**/*
+      - lib/**/*
+      - tasks/**/*
+      - functions/**/*
+      - types/**/*
+      - plans/**/*
+      - hiera/**/*
+      - manifests/**/*
+      - templates/**/*
+      - files/**/*
+      - metadata.json
+      - Rakefile
+      - Gemfile
+      - provision.yaml
+      - .rspec
+      - .rubocop.yml
+      - .puppet-lint.rc
+      - .fixtures.yml
     branches: [main]
   workflow_dispatch: {}
-
 jobs:
   test-install:
-    name: "PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }} with fips ${{ matrix.fips }}"
+    name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
+      with fips ${{ matrix.fips }}
     runs-on: ubuntu-20.04
     env:
       BOLT_GEM: true
       BOLT_DISABLE_ANALYTICS: true
-      LANG: "en_US.UTF-8"
+      LANG: en_US.UTF-8
     strategy:
       fail-fast: false
       matrix:
-        architecture:
-          - standard-with-dr
-          - large
-          - extra-large-with-dr
-        version:
-          - 2019.8.12
-          - 2021.7.8
-          - 2023.7.0
-        image:
-          - rhel-8
-        fips:
-          - enable
-
+        architecture: [standard-with-dr, large, extra-large-with-dr]
+        version: [2019.8.12, 2021.7.9, 2023.8.0]
+        image: [rhel-8]
+        fips: [enable]
     steps:
-      - name: "Checkout Source"
+      - name: Checkout Source
         uses: actions/checkout@v4
-
-      - name: "Activate Ruby 2.7"
+      - name: Activate Ruby 2.7
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.7"
+          ruby-version: '2.7'
           bundler-cache: true
-
-      - name: "Print bundle environment"
+      - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
         run: |
           echo ::group::info:bundler
             bundle env
           echo ::endgroup::
-
-      - name: "Provision test cluster"
+      - name: Provision test cluster
         timeout-minutes: 15
         run: |
           echo ::group::prepare
@@ -77,24 +64,20 @@ jobs:
             echo '    ServerAliveCountMax 2'   >> $HOME/.ssh/config
             bundle exec rake spec_prep
           echo ::endgroup::
-
           echo ::group::provision
             bundle exec bolt plan run peadm_spec::provision_test_cluster \
               --modulepath spec/fixtures/modules \
               provider=provision_service \
               image=${{ matrix.image }} \
               architecture=${{ matrix.architecture }}
           echo ::endgroup::
-
           echo ::group::info:request
             cat request.json || true; echo
           echo ::endgroup::
-
           echo ::group::info:inventory
             sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
           echo ::endgroup::
-
-      - name: "Install PE on test cluster"
+      - name: Install PE on test cluster
         timeout-minutes: 120
         run: |
           bundle exec bolt plan run peadm_spec::install_test_cluster \
@@ -104,16 +87,14 @@ jobs:
             version=${{ matrix.version }} \
             fips=${{ matrix.fips }} \
             console_password=${{ secrets.CONSOLE_PASSWORD }}
-
-      - name: "Tear down test cluster"
+      - name: Tear down test cluster
         if: ${{ always() }}
         continue-on-error: true
-        run: |
+        run: |-
           if [ -f spec/fixtures/litmus_inventory.yaml ]; then
             echo ::group::tear_down
               bundle exec rake 'litmus:tear_down'
             echo ::endgroup::
-
             echo ::group::info:request
               cat request.json || true; echo
             echo ::endgroup::

diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
@@ -43,8 +43,8 @@ jobs:
           - extra-large-with-dr
         version:
           - 2019.8.12
-          - 2021.7.8
-          - 2023.7.0
+          - 2021.7.9
+          - 2023.8.0
         image:
           - almalinux-cloud/almalinux-8
     steps:

diff --git a/.github/workflows/test-install-rhel-9.yaml b/.github/workflows/test-install-rhel-9.yaml
@@ -42,8 +42,8 @@ jobs:
           - large
           - extra-large-with-dr
         version:
-          - 2021.7.8
-          - 2023.7.0
+          - 2021.7.9
+          - 2023.8.0
         image:
           - rhel-9
     steps:

diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml
@@ -1,69 +1,59 @@
 ---
-name: "Install test"
-
+name: Install test
 on:
   workflow_dispatch:
     inputs:
       image:
-        description: 'GCP image for test cluster'
+        description: GCP image for test cluster
         required: true
-        default: 'almalinux-cloud/almalinux-8'
+        default: almalinux-cloud/almalinux-8
       architecture:
-        description: 'PE architecture to test'
+        description: PE architecture to test
         required: true
-        default: 'standard'
+        default: standard
       version:
-        description: 'PE version to install'
+        description: PE version to install
         required: true
-        default: '2021.7.8'
+        default: 2021.7.9
       ssh-debugging:
-        description: 'Boolean; whether or not to pause for ssh debugging'
+        description: Boolean; whether or not to pause for ssh debugging
         required: true
         default: 'false'
-
 jobs:
   test-install:
-    name: "PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}"
+    name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
     runs-on: ubuntu-20.04
     env:
       BOLT_GEM: true
       BOLT_DISABLE_ANALYTICS: true
-      LANG: 'en_US.UTF-8'
+      LANG: en_US.UTF-8
     strategy:
       fail-fast: false
       matrix:
-        architecture:
-          - "${{ github.event.inputs.architecture }}"
-        version:
-          - "${{ github.event.inputs.version }}"
-        image:
-          - "${{ github.event.inputs.image }}"
-
+        architecture: ['${{ github.event.inputs.architecture }}']
+        version: ['${{ github.event.inputs.version }}']
+        image: ['${{ github.event.inputs.image }}']
     steps:
-      - name: 'Start SSH session'
+      - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
         uses: luchihoratiu/debug-via-ssh@main
         with:
           NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
           SSH_PASS: ${{ secrets.SSH_PASS }}
-
-      - name: "Checkout Source"
+      - name: Checkout Source
         uses: actions/checkout@v4
-
-      - name: "Activate Ruby 2.7"
+      - name: Activate Ruby 2.7
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.7"
+          ruby-version: '2.7'
           bundler-cache: true
-
-      - name: "Print bundle environment"
+      - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
         run: |
           echo ::group::info:bundler
             bundle env
           echo ::endgroup::
-
-      - name: 'Provision test cluster'
+      - name: Provision test cluster
         timeout-minutes: 15
         run: |
           echo ::group::prepare
@@ -73,24 +63,20 @@ jobs:
             echo '    ServerAliveCountMax 2'   >> $HOME/.ssh/config
             bundle exec rake spec_prep
           echo ::endgroup::
-
           echo ::group::provision
             bundle exec bolt plan run peadm_spec::provision_test_cluster \
               --modulepath spec/fixtures/modules \
               provider=provision_service \
               image=${{ matrix.image }} \
               architecture=${{ matrix.architecture }}
           echo ::endgroup::
-
           echo ::group::info:request
             cat request.json || true; echo
           echo ::endgroup::
-
           echo ::group::info:inventory
             sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
           echo ::endgroup::
-
-      - name: 'Install PE on test cluster'
+      - name: Install PE on test cluster
         timeout-minutes: 120
         run: |
           bundle exec bolt plan run peadm_spec::install_test_cluster \
@@ -99,25 +85,22 @@ jobs:
             architecture=${{ matrix.architecture }} \
             version=${{ matrix.version }} \
             console_password=${{ secrets.CONSOLE_PASSWORD }}
-
-      - name: 'Wait as long as the file ${HOME}/pause file is present'
+      - name: Wait as long as the file ${HOME}/pause file is present
         if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
         run: |
           while [ -f "${HOME}/pause" ] ; do
             echo "${HOME}/pause present, sleeping for 60 seconds..."
             sleep 60
           done 
           echo "${HOME}/pause absent, continuing workflow."
-
-      - name: 'Tear down test cluster'
+      - name: Tear down test cluster
         if: ${{ always() }}
         continue-on-error: true
-        run: |
+        run: |-
           if [ -f spec/fixtures/litmus_inventory.yaml ]; then
             echo ::group::tear_down
               bundle exec rake 'litmus:tear_down'
             echo ::endgroup::
-
             echo ::group::info:request
               cat request.json || true; echo
             echo ::endgroup::

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.8"
+        default: "2021.7.9"
       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.8"
+          - "2021.7.9"
         image:
           - "almalinux-cloud/almalinux-8"
 

diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml
@@ -43,19 +43,19 @@ jobs:
           - 'extra-large-with-dr'
         version:
           - '2019.8.12'
-          - '2021.7.8'
+          - '2021.7.9'
         version_to_upgrade:
-          - '2021.7.8'
-          - '2023.7.0'
+          - '2021.7.9'
+          - '2023.8.0'
         image:
           - 'almalinux-cloud/almalinux-8'
         download_mode:
           - 'direct'
         exclude:
           - version: '2019.8.12'
-            version_to_upgrade: '2023.7.0'
-          - version: '2021.7.8'
-            version_to_upgrade: '2021.7.8' 
+            version_to_upgrade: '2023.8.0'
+          - version: '2021.7.9'
+            version_to_upgrade: '2021.7.9' 
 
     steps:
       - name: 'Start SSH session'

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.8'
+        default: '2021.7.9'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true