Skip to content

Commit 116283e

Browse files
committed
(maint) Make PE 2023 install by default
1 parent 49f7602 commit 116283e

20 files changed

+25
-25
lines changed

Diff for: .github/workflows/test-add-compiler-matrix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
architecture: [standard, large, extra-large]
39-
version: [2021.7.9, 2023.8.0, 2025.1.0]
39+
version: [2021.7.9, 2023.8.0, 2025.0.0]
4040
image: [almalinux-cloud/almalinux-8]
4141
steps:
4242
- name: Checkout Source

Diff for: .github/workflows/test-add-compiler.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
version:
1515
description: PE version to install
1616
required: true
17-
default: 2021.7.9
17+
default: 2023.8.0
1818
ssh-debugging:
1919
description: Boolean; whether or not to pause for ssh debugging
2020
required: true

Diff for: .github/workflows/test-add-replica-matrix.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
architecture: [standard, standard-with-dr, large, extra-large]
39-
version: [2023.8.0, 2025.1.0]
39+
version: [2023.8.0, 2025.0.0]
4040
image: [almalinux-cloud/almalinux-8]
4141
steps:
4242
- name: Checkout Source

Diff for: .github/workflows/test-add-replica.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
version:
1515
description: PE version to install
1616
required: true
17-
default: 2021.7.9
17+
default: 2023.8.0
1818
ssh-debugging:
1919
description: Boolean; whether or not to pause for ssh debugging
2020
required: true

Diff for: .github/workflows/test-backup-restore.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ on:
2424
version:
2525
description: PE version to install
2626
required: true
27-
default: 2025.1.0
27+
default: 2025.0.0
2828
ssh-debugging:
2929
description: Boolean; whether or not to pause for ssh debugging
3030
required: true
3131
default: 'false'
3232
jobs:
3333
backup-restore-test:
34-
name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.1.0' }}\
34+
name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.0.0' }}\
3535
\ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}"
3636
runs-on: ubuntu-20.04
3737
env:

Diff for: .github/workflows/test-fips-install-matrix.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
architecture: [standard-with-dr, large, extra-large-with-dr]
40-
version: [2019.8.12, 2021.7.9, 2023.8.0, 2025.1.0]
40+
version: [2019.8.12, 2021.7.9, 2023.8.0, 2025.0.0]
4141
image: [rhel-8]
4242
fips: [enable]
4343
steps:

Diff for: .github/workflows/test-install-matrix.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
architecture: [standard-with-dr, large, extra-large-with-dr]
39-
version: [2019.8.12, 2021.7.9, 2023.8.0, 2025.1.0]
39+
version: [2019.8.12, 2021.7.9, 2023.8.0, 2025.0.0]
4040
image: [almalinux-cloud/almalinux-8]
4141
steps:
4242
- name: Checkout Source

Diff for: .github/workflows/test-install-rhel-9.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
architecture: [standard-with-dr, large, extra-large-with-dr]
39-
version: [2021.7.9, 2023.8.0, 2025.1.0]
39+
version: [2021.7.9, 2023.8.0, 2025.0.0]
4040
image: [rhel-9]
4141
steps:
4242
- name: Checkout Source

Diff for: .github/workflows/test-install.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
version:
1515
description: PE version to install
1616
required: true
17-
default: 2021.7.9
17+
default: 2023.8.0
1818
ssh-debugging:
1919
description: Boolean; whether or not to pause for ssh debugging
2020
required: true

Diff for: .github/workflows/test-legacy-compilers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
--modulepath spec/fixtures/modules \
100100
architecture=large-with-dr \
101101
console_password=${{ secrets.CONSOLE_PASSWORD }} \
102-
version=2025.1.0
102+
version=2025.0.0
103103
- name: Wait as long as the file ${HOME}/pause file is present
104104
if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
105105
run: |

Diff for: .github/workflows/test-legacy-upgrade.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
legacy_compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | sed -n 2p)
9999
replica=$(yq '.groups[].targets[] | select(.vars.role == "replica") | .name' spec/fixtures/litmus_inventory.yaml)
100100
hash_random=$(LC_ALL=C tr -dc 'A-Za-z0-9!#$%&'\''()*+,-./:;<=>?@[\]^_`{|}~' </dev/urandom | head -c 30; echo)
101-
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
101+
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
102102
- name: Install PE with legacy compilers
103103
timeout-minutes: 120
104104
run: |

Diff for: .github/workflows/test-upgrade-latest-dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
type: string
2424
required: true
2525
description: The initial version of PE to install before upgrade
26-
default: 2021.7.9
26+
default: 2023.8.0
2727
ssh-debugging:
2828
description: Boolean; whether or not to pause for ssh debugging
2929
required: true

Diff for: .github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
architecture: [extra-large-with-dr]
19-
version: [2021.7.9]
19+
version: [2023.8.0]
2020
image: [almalinux-cloud/almalinux-8]
2121
steps:
2222
- name: Checkout Source

Diff for: .github/workflows/test-upgrade-matrix.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ jobs:
3838
matrix:
3939
architecture: [standard, extra-large-with-dr]
4040
version: [2019.8.12, 2021.7.9, 2023.8.0]
41-
version_to_upgrade: [2021.7.9, 2023.8.0, 2025.1.0]
41+
version_to_upgrade: [2021.7.9, 2023.8.0, 2025.0.0]
4242
image: [almalinux-cloud/almalinux-8]
4343
download_mode: [direct]
4444
exclude:
4545
- version: 2019.8.12
4646
version_to_upgrade: 2023.8.0
4747
- version: 2019.8.12
48-
version_to_upgrade: 2025.1.0
48+
version_to_upgrade: 2025.0.0
4949
- version: 2021.7.9
5050
version_to_upgrade: 2021.7.9
5151
- version: 2021.7.9
52-
version_to_upgrade: 2025.1.0
52+
version_to_upgrade: 2025.0.0
5353
- version: 2023.8.0
5454
version_to_upgrade: 2023.8.0
5555
- version: 2023.8.0
56-
version_to_upgrade: 2025.1.0
56+
version_to_upgrade: 2025.0.0
5757
- version: 2023.8.0
5858
version_to_upgrade: 2021.7.9
5959
steps:

Diff for: REFERENCE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2185,7 +2185,7 @@ Data type: `Peadm::Pe_version`
21852185

21862186

21872187

2188-
Default value: `'2021.7.9'`
2188+
Default value: `'2023.8.0'`
21892189

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

Diff for: documentation/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Example params.json Bolt parameters file (shown: Standard):
120120
"primary_host": "pe-xl-core-0.lab1.puppet.vm",
121121
"console_password": "puppetlabs",
122122
"dns_alt_names": ["puppet", "puppet.lab1.puppet.vm"],
123-
"version": "2021.7.9"
123+
"version": "2023.8.0"
124124
}
125125
```
126126

Diff for: functions/assert_supported_pe_version.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function peadm::assert_supported_pe_version (
66
Boolean $permit_unsafe_versions = false,
77
) >> Struct[{ 'supported' => Boolean }] {
88
$oldest = '2019.7'
9-
$newest = '2025.1'
9+
$newest = '2025.0'
1010
$supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))
1111

1212
if $permit_unsafe_versions {

Diff for: plans/install.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
# Common Configuration
4848
String $console_password,
49-
Peadm::Pe_version $version = '2021.7.9',
49+
Peadm::Pe_version $version = '2023.8.0',
5050
Optional[Stdlib::HTTPSUrl] $pe_installer_source = undef,
5151
Optional[Array[String]] $dns_alt_names = undef,
5252
Optional[String] $compiler_pool_address = undef,

Diff for: spec/functions/assert_supported_pe_version_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
end
2020

2121
it 'accepts the newest supported version' do
22-
is_expected.to run.with_params('2025.1.0').and_return({ 'supported' => true })
22+
is_expected.to run.with_params('2025.0.0').and_return({ 'supported' => true })
2323
end
2424

2525
it 'accepts a version in the middle' do

Diff for: spec/plans/subplans/install_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
expect(run_plan('peadm::subplans::install', params)).to be_ok
8888
end
8989

90-
it 'installs 2021.7.9 with legacy compilers' do
90+
it 'installs 2023.8.0 with legacy compilers' do
9191
params = {
9292
'primary_host' => 'primary',
9393
'console_password' => 'puppetLabs123!',
94-
'version' => '2021.7.9',
94+
'version' => '2023.8.0',
9595
'legacy_compilers' => ['compiler1', 'compiler2'],
9696
}
9797
expect(run_plan('peadm::subplans::install', params)).to be_ok

0 commit comments

Comments
 (0)