Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PE-39891) Add support for PE 2025 #533

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-add-compiler-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-add-compiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
version:
description: PE version to install
required: true
default: 2021.7.9
default: 2023.8.0
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-add-replica-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-add-replica.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
version:
description: PE version to install
required: true
default: 2021.7.9
default: 2023.8.0
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-backup-restore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ on:
version:
description: PE version to install
required: true
default: 2023.5.0
default: 2025.0.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.0.0' }}\
\ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}"
runs-on: ubuntu-20.04
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-failover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-fips-install-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0]
image: [rhel-8]
fips: [enable]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install-rhel-9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0]
image: [rhel-9]
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
version:
description: PE version to install
required: true
default: 2021.7.9
default: 2023.8.0
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-legacy-compilers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
--modulepath spec/fixtures/modules \
architecture=large-with-dr \
console_password=${{ secrets.CONSOLE_PASSWORD }} \
version=2023.7.0
version=2025.0.0
- name: Wait as long as the file ${HOME}/pause file is present
if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-legacy-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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!#$%&'\''()*+,-./:;<=>?@[\]^_`{|}~' </dev/urandom | head -c 30; echo)
echo -n '{ "download_mode": "direct", "primary_host": "'$primary'", "replica_host": "'$replica'", "legacy_compilers": ["'$legacy_compiler'"], "compiler_hosts": ["'$compiler'"], "version": "2023.7.0", "console_password": "'$hash_random'" }' > params.json
echo -n '{ "download_mode": "direct", "primary_host": "'$primary'", "replica_host": "'$replica'", "legacy_compilers": ["'$legacy_compiler'"], "compiler_hosts": ["'$compiler'"], "version": "2025.0.0", "console_password": "'$hash_random'" }' > params.json
- name: Install PE with legacy compilers
timeout-minutes: 120
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade-latest-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
type: string
required: true
description: The initial version of PE to install before upgrade
default: 2021.7.9
default: 2023.8.0
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
architecture: [extra-large-with-dr]
version: [2021.7.9]
version: [2023.8.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/test-upgrade-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.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.0.0
- version: 2021.7.9
version_to_upgrade: 2021.7.9
- version: 2021.7.9
version_to_upgrade: 2025.0.0
- version: 2023.8.0
version_to_upgrade: 2023.8.0
- version: 2023.8.0
version_to_upgrade: 2025.0.0
- version: 2023.8.0
version_to_upgrade: 2021.7.9
steps:
- name: Start SSH session
Expand Down
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2185,7 +2185,7 @@ Data type: `Peadm::Pe_version`



Default value: `'2021.7.9'`
Default value: `'2023.8.0'`

##### <a name="-peadm--install--dns_alt_names"></a>`dns_alt_names`

Expand Down
2 changes: 1 addition & 1 deletion documentation/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Example params.json Bolt parameters file (shown: Standard):
"primary_host": "pe-xl-core-0.lab1.puppet.vm",
"console_password": "puppetlabs",
"dns_alt_names": ["puppet", "puppet.lab1.puppet.vm"],
"version": "2021.7.9"
"version": "2023.8.0"
}
```

Expand Down
2 changes: 1 addition & 1 deletion functions/assert_supported_pe_version.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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.0'
$supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))

if $permit_unsafe_versions {
Expand Down
2 changes: 1 addition & 1 deletion plans/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

# Common Configuration
String $console_password,
Peadm::Pe_version $version = '2021.7.9',
Peadm::Pe_version $version = '2023.8.0',
Optional[Stdlib::HTTPSUrl] $pe_installer_source = undef,
Optional[Array[String]] $dns_alt_names = undef,
Optional[String] $compiler_pool_address = undef,
Expand Down
2 changes: 1 addition & 1 deletion spec/functions/assert_supported_pe_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0').and_return({ 'supported' => true })
end

it 'accepts a version in the middle' do
Expand Down
4 changes: 2 additions & 2 deletions spec/plans/subplans/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
expect(run_plan('peadm::subplans::install', params)).to be_ok
end

it 'installs 2021.7.9 with legacy compilers' do
it 'installs 2023.8.0 with legacy compilers' do
params = {
'primary_host' => 'primary',
'console_password' => 'puppetLabs123!',
'version' => '2021.7.9',
'version' => '2023.8.0',
'legacy_compilers' => ['compiler1', 'compiler2'],
}
expect(run_plan('peadm::subplans::install', params)).to be_ok
Expand Down
Loading