6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ on:
branches:
- "main"
workflow_dispatch:

jobs:
Spec:
if: ${{ github.repository_owner == 'puppetlabs' }}
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
secrets: "inherit"

Acceptance:
if: ${{ github.repository_owner == 'puppetlabs' }}
needs: Spec
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
with:
flags: "--provision-service"
secrets: "inherit"
4 changes: 4 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ on:

jobs:
Spec:
if: ${{ github.repository_owner == 'puppetlabs' }}
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
secrets: "inherit"

Acceptance:
if: ${{ github.repository_owner == 'puppetlabs' }}
needs: Spec
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
with:
flags: "--provision-service"
secrets: "inherit"
2 changes: 1 addition & 1 deletion .github/workflows/test-add-compiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.4'
default: '2021.7.6'
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-add-replica.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.4'
default: '2021.7.6'
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-backup-restore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.4'
default: '2021.7.6'
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-failover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version_to_upgrade:
description: 'PE version to upgrade to'
required: false
default: '2021.7.4'
default: '2021.7.6'
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 @@ -43,7 +43,7 @@ jobs:
- extra-large-with-dr
version:
- 2019.8.12
- 2021.7.5
- 2021.7.6
- 2023.5.0
image:
- rhel-8
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 @@ -43,7 +43,7 @@ jobs:
- extra-large-with-dr
version:
- 2019.8.12
- 2021.7.5
- 2021.7.6
- 2023.5.0
image:
- centos-7
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 @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.4'
default: '2021.7.6'
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-upgrade-latest-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
type: string
required: true
description: "The initial version of PE to install before upgrade"
default: "2021.7.4"
default: "2021.7.6"
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 @@ -19,7 +19,7 @@ jobs:
architecture:
- "extra-large-with-dr"
version:
- "2021.7.4"
- "2021.7.6"
image:
- "almalinux-cloud/almalinux-8"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
version:
- '2019.8.12'
version_to_upgrade:
- '2021.7.4'
- '2021.7.6'
image:
- 'almalinux-cloud/almalinux-8'
download_mode:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
upgrade_version:
description: 'PE version to upgrade to'
required: true
default: '2021.7.4'
default: '2021.7.6'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ 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.16.1](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.16.1) - 2023-11-23

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

### Other

- (PE-37192) Updating default install version to 2021.7.6 [#406](https://github.com/puppetlabs/puppetlabs-peadm/pull/406) ([ragingra](https://github.com/ragingra))
- (MAINT) Update release_process.md [#405](https://github.com/puppetlabs/puppetlabs-peadm/pull/405) ([Jo-Lillie](https://github.com/Jo-Lillie))

## [v3.16.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.16.0) - 2023-11-08

[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.15.1...v3.16.0)
Expand Down
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -1826,7 +1826,7 @@ Data type: `Peadm::Pe_version`



Default value: `'2021.7.4'`
Default value: `'2021.7.6'`

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

Expand Down
3 changes: 1 addition & 2 deletions documentation/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,9 @@ Example params.json Bolt parameters file (shown: Standard):
```json
{
"primary_host": "pe-xl-core-0.lab1.puppet.vm",

"console_password": "puppetlabs",
"dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],
"version": "2021.5.0",
"version": "2021.7.6"
}
```

Expand Down
2 changes: 1 addition & 1 deletion documentation/release_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
- [ ] Kick off the [Release Prep](https://github.com/puppetlabs/puppetlabs-peadm/actions/workflows/release-prep.yml) action selecting the branch you want to release from and enter the release version number.
- [ ] Review and merge the Release PREP Pull Request. Make sure to verify the checklist items in the Pull Request description.
- [ ] Once the Release Prep Pull Request is merged, Kick off [Publish module](https://github.com/puppetlabs/puppetlabs-peadm/actions/workflows/release.yml) action selecting the branch you created the Release Prep Pull Request from.
- [ ] Check Puppet Forge to make sure the module was published
- [ ] Check [Puppet Forge](https://forge.puppet.com/modules/puppetlabs/peadm/readme) to make sure the module was published
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.16.0",
"version": "3.16.1",
"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/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

# Common Configuration
String $console_password,
Peadm::Pe_version $version = '2021.7.4',
Peadm::Pe_version $version = '2021.7.6',
Optional[String] $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.4').and_return({ 'supported' => true })
is_expected.to run.with_params('2021.7.6').and_return({ 'supported' => true })
end

it 'accepts a version in the middle' do
Expand Down
2 changes: 1 addition & 1 deletion spec/plans/convert_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
allow_apply

expect_task('peadm::cert_data').return_for_targets('primary' => trustedjson)
expect_task('peadm::read_file').always_return({ 'content' => '2021.7.4' })
expect_task('peadm::read_file').always_return({ 'content' => '2021.7.6' })

# For some reason, expect_plan() was not working??
allow_plan('peadm::modify_certificate').always_return({})
Expand Down
2 changes: 1 addition & 1 deletion spec/plans/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
it 'runs successfully with the minimum required parameters' do
expect_plan('peadm::subplans::install')
expect_plan('peadm::subplans::configure')
expect(run_plan('peadm::install', 'primary_host' => 'primary', 'console_password' => 'puppetlabs')).to be_ok
expect(run_plan('peadm::install', 'primary_host' => 'primary', 'console_password' => 'puppetlabs', 'version' => '2021.7.6')).to be_ok
end
end
end
4 changes: 2 additions & 2 deletions spec/plans/upgrade_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def allow_standard_non_returning_calls

expect(run_plan('peadm::upgrade',
'primary_host' => 'primary',
'version' => '2021.7.4')).to be_ok
'version' => '2021.7.6')).to be_ok
end

it 'runs with a primary, compilers, but no replica' do
Expand All @@ -47,7 +47,7 @@ def allow_standard_non_returning_calls
expect(run_plan('peadm::upgrade',
'primary_host' => 'primary',
'compiler_hosts' => 'compiler',
'version' => '2021.7.4')).to be_ok
'version' => '2021.7.6')).to be_ok
end

it 'fails if the primary uses the pcp transport' do
Expand Down