From 1758f083276e197878be41bc9f88c51a4935b819 Mon Sep 17 00:00:00 2001 From: Jacob Buchanan Date: Wed, 11 Dec 2024 16:19:16 +0000 Subject: [PATCH] (maint) Add PEADM support for PE 2025.1 --- .github/workflows/test-add-compiler-matrix.yml | 2 +- .github/workflows/test-add-compiler.yaml | 2 +- .github/workflows/test-add-replica-matrix.yaml | 2 +- .github/workflows/test-backup-restore.yaml | 4 ++-- .github/workflows/test-failover.yaml | 2 +- .github/workflows/test-fips-install-matrix.yaml | 2 +- .github/workflows/test-install-matrix.yaml | 2 +- .github/workflows/test-install-rhel-9.yaml | 2 +- .github/workflows/test-legacy-compilers.yaml | 2 +- .github/workflows/test-legacy-upgrade.yaml | 2 +- .github/workflows/test-upgrade-matrix.yaml | 14 ++++++++++++-- functions/assert_supported_pe_version.pp | 2 +- spec/functions/assert_supported_pe_version_spec.rb | 2 +- 13 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml index b3009ed7..b0b39a31 100644 --- 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.0] + version: [2021.7.9, 2023.8.0, 2025.1.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 index 52711f87..0e590260 100644 --- a/.github/workflows/test-add-compiler.yaml +++ b/.github/workflows/test-add-compiler.yaml @@ -84,7 +84,7 @@ jobs: --modulepath spec/fixtures/modules \ architecture=${{ matrix.architecture }} \ version=${{ matrix.version }} \ - console_password=${{ secrets.CONSOLE_PASSWORD } + console_password=${{ secrets.CONSOLE_PASSWORD }} - name: Run add_compilers plan timeout-minutes: 50 run: | diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml index 1c08ef44..6ee31edc 100644 --- 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.0] + version: [2023.8.0, 2025.1.0] image: [almalinux-cloud/almalinux-8] steps: - name: Checkout Source diff --git a/.github/workflows/test-backup-restore.yaml b/.github/workflows/test-backup-restore.yaml index 452b0e03..09fc526e 100644 --- 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: 2023.5.0 + default: 2025.1.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 || '2023.5.0' }}\ + name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.1.0' }}\ \ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}" runs-on: ubuntu-20.04 env: diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml index 3f5fca52..cfe6e59a 100644 --- 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: 2021.7.9 + default: 2023.8.0 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 index 4f17044b..897c75b7 100644 --- 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: [2019.8.12, 2021.7.9, 2023.8.0] + version: [2019.8.12, 2021.7.9, 2023.8.0, 2025.1.0] image: [rhel-8] fips: [enable] steps: diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml index 087a66e2..a5822b74 100644 --- 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: [2019.8.12, 2021.7.9, 2023.8.0] + version: [2019.8.12, 2021.7.9, 2023.8.0, 2025.1.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 index ba9fbeac..0d111b77 100644 --- 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.0] + version: [2021.7.9, 2023.8.0, 2025.1.0] image: [rhel-9] steps: - name: Checkout Source diff --git a/.github/workflows/test-legacy-compilers.yaml b/.github/workflows/test-legacy-compilers.yaml index e7857892..5d3abd49 100644 --- 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=2023.7.0 + version=2025.1.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 index fd88557e..f34d2ca2 100644 --- a/.github/workflows/test-legacy-upgrade.yaml +++ b/.github/workflows/test-legacy-upgrade.yaml @@ -98,7 +98,7 @@ jobs: 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) hash_random=$(LC_ALL=C tr -dc 'A-Za-z0-9!#$%&'\''()*+,-./:;<=>?@[\]^_`{|}~' params.json + echo -n '{ "download_mode": "direct", "primary_host": "'$primary'", "replica_host": "'$replica'", "legacy_compilers": ["'$legacy_compiler'"], "compiler_hosts": ["'$compiler'"], "version": "2025.1.0", "console_password": "'$hash_random'" }' > params.json - name: Install PE with legacy compilers timeout-minutes: 120 run: | diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml index 0ccede8f..182e46eb 100644 --- a/.github/workflows/test-upgrade-matrix.yaml +++ b/.github/workflows/test-upgrade-matrix.yaml @@ -37,14 +37,24 @@ jobs: fail-fast: false matrix: architecture: [standard, extra-large-with-dr] - version: [2019.8.12, 2021.7.9] - version_to_upgrade: [2021.7.9, 2023.8.0] + version: [2019.8.12, 2021.7.9, 2023.8.0] + version_to_upgrade: [2021.7.9, 2023.8.0, 2025.1.0] image: [almalinux-cloud/almalinux-8] download_mode: [direct] exclude: - version: 2019.8.12 version_to_upgrade: 2023.8.0 + - version: 2019.8.12 + version_to_upgrade: 2025.1.0 + - version: 2021.7.9 + version_to_upgrade: 2021.7.9 - version: 2021.7.9 + version_to_upgrade: 2025.1.0 + - version: 2023.8.0 + version_to_upgrade: 2023.8.0 + - version: 2023.8.0 + version_to_upgrade: 2025.1.0 + - version: 2023.8.0 version_to_upgrade: 2021.7.9 steps: - name: Start SSH session diff --git a/functions/assert_supported_pe_version.pp b/functions/assert_supported_pe_version.pp index 6fc3c315..68cd45b0 100644 --- 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.8' + $newest = '2025.1' $supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}")) if $permit_unsafe_versions { diff --git a/spec/functions/assert_supported_pe_version_spec.rb b/spec/functions/assert_supported_pe_version_spec.rb index 293cf548..82656171 100644 --- 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.9').and_return({ 'supported' => true }) + is_expected.to run.with_params('2025.1.0').and_return({ 'supported' => true }) end it 'accepts a version in the middle' do