Skip to content

(PE-40382) Phase 2 (CI) migrate to large with PE upgrade #571

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

Closed
wants to merge 9 commits into from
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.2, 2025.1.0]
version: [2021.7.9, 2023.8.2, 2025.2.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
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.2, 2025.1.0]
version: [2023.8.2, 2025.2.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
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: 2025.1.0
default: 2025.2.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.1.0' }}\
name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.2.0' }}\
\ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}"
runs-on: ubuntu-latest
env:
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.2, 2025.1.0]
version: [2019.8.12, 2021.7.9, 2023.8.2, 2025.2.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.2, 2025.1.0]
version: [2019.8.12, 2021.7.9, 2023.8.2, 2025.2.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.2, 2025.1.0]
version: [2021.7.9, 2023.8.2, 2025.2.0]
image: [rhel-9]
steps:
- name: Checkout Source
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=2025.1.0
version=2025.2.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 @@ -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.1.0"}' > upgrade_params.json
echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.2.0"}' > upgrade_params.json
- name: Upgrade PE with legacy compilers
run: |
echo ::group::upgrade_params.json
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-migration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ jobs:
architecture:
- standard
- standard-with-dr
# - large
- large
# - extra-large
# - large-with-dr
- large-with-dr
# - extra-large-with-dr
version: [2021.7.9, 2023.8.2, 2025.1.0]
version: [2021.7.9, 2023.8.2, 2025.2.0]
image: [almalinux-cloud/almalinux-8]
include:
- architecture: standard
- architecture: [standard, large]
version: 2023.8.0
image: almalinux-cloud/almalinux-8
new_pe_version: 2025.0.0
new_pe_version: 2025.2.0
steps:
- name: Checkout Source
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-replace-failed-postgresql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2, 2025.1.0]
version: [2021.7.9, 2023.8.2, 2025.2.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/test-upgrade-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,22 @@ jobs:
matrix:
architecture: [standard, extra-large-with-dr]
version: [2019.8.12, 2021.7.9, 2023.8.2]
version_to_upgrade: [2021.7.9, 2023.8.2, 2025.1.0]
version_to_upgrade: [2021.7.9, 2023.8.2, 2025.2.0]
image: [almalinux-cloud/almalinux-8]
download_mode: [direct]
exclude:
- version: 2019.8.12
version_to_upgrade: 2023.8.2
- version: 2019.8.12
version_to_upgrade: 2025.1.0
version_to_upgrade: 2025.2.0
- version: 2021.7.9
version_to_upgrade: 2021.7.9
- version: 2021.7.9
version_to_upgrade: 2025.1.0
version_to_upgrade: 2025.2.0
- version: 2023.8.1
version_to_upgrade: 2023.8.2
- version: 2023.8.2
version_to_upgrade: 2025.1.0
- version: 2023.8.2
version_to_upgrade: 2021.7.9
- version: 2025.0.0
version_to_upgrade: 2025.1.0
steps:
- name: Start SSH session
if: ${{ github.event.inputs.ssh-debugging == 'true' }}
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,26 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).

## [v3.28.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.28.0) - 2025-03-28

[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.27.0...v3.28.0)

### Added

- (RE-16847) add support for PE 2025.2.0 [#570](https://github.com/puppetlabs/puppetlabs-peadm/pull/570) ([davidmalloncares](https://github.com/davidmalloncares))

### Other

- (PE-39577) Optimise legacy compiler support [#536](https://github.com/puppetlabs/puppetlabs-peadm/pull/536) ([petergmurphy](https://github.com/petergmurphy))
- (PE-39397) Adding LDAP endpoint for 2023.8 [#515](https://github.com/puppetlabs/puppetlabs-peadm/pull/515) ([ragingra](https://github.com/ragingra))

## [v3.27.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.27.0) - 2025-03-07

[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.26.1...v3.27.0)

### Added

- (PE-40784) Add support for PE 2023.8.2 and 2025.1.0 [#560](https://github.com/puppetlabs/puppetlabs-peadm/pull/560) ([davidmalloncares](https://github.com/davidmalloncares))
- (PE-40163) automate recovery of failed postgres server [#537](https://github.com/puppetlabs/puppetlabs-peadm/pull/537) ([davidmalloncares](https://github.com/davidmalloncares))

### Fixed
Expand All @@ -19,7 +33,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a

### Other

- (PE-40784) Add support for PE 2023.8.2 and 2025.1.0 [#560](https://github.com/puppetlabs/puppetlabs-peadm/pull/560) ([davidmalloncares](https://github.com/davidmalloncares))
- (PE-40691) document automated steps for failed postgres and adding compilers [#554](https://github.com/puppetlabs/puppetlabs-peadm/pull/554) ([davidmalloncares](https://github.com/davidmalloncares))

## [v3.26.1](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.26.1) - 2025-01-23
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 = '2025.1'
$newest = '2025.2'
$supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))

if $permit_unsafe_versions {
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-peadm",
"version": "3.27.0",
"version": "3.28.0",
"author": "puppetlabs",
"summary": "Bolt plans used to deploy an at-scale Puppet Enterprise architecture",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion plans/add_replica.pp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
# probably gets "starting", but fails out because that's not "running".
# Can remove flag when that issue is fixed.
legacy => false,
# _catch_errors => true, # testing
_catch_errors => true,
)

# start puppet service
Expand Down
Loading