diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml index 0e9fafd2..94173359 100644 --- a/.github/workflows/test-add-compiler.yaml +++ b/.github/workflows/test-add-compiler.yaml @@ -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 diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml index b7460562..3e5ebbf3 100644 --- a/.github/workflows/test-add-replica.yaml +++ b/.github/workflows/test-add-replica.yaml @@ -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 diff --git a/.github/workflows/test-backup-restore.yaml b/.github/workflows/test-backup-restore.yaml index 3bf0fd8f..e65fdaf8 100644 --- a/.github/workflows/test-backup-restore.yaml +++ b/.github/workflows/test-backup-restore.yaml @@ -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 diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml index bb6a7d4c..e214954b 100644 --- a/.github/workflows/test-failover.yaml +++ b/.github/workflows/test-failover.yaml @@ -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 diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml index da99d85b..5e711440 100644 --- a/.github/workflows/test-install.yaml +++ b/.github/workflows/test-install.yaml @@ -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 diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml index a292974a..a53b5916 100644 --- a/.github/workflows/test-upgrade-latest-dev.yaml +++ b/.github/workflows/test-upgrade-latest-dev.yaml @@ -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 diff --git a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml index 2d0923a5..b4a45285 100644 --- a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml +++ b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml @@ -19,7 +19,7 @@ jobs: architecture: - "extra-large-with-dr" version: - - "2021.7.4" + - "2021.7.6" image: - "almalinux-cloud/almalinux-8" diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml index 7c42befd..54dc6261 100644 --- a/.github/workflows/test-upgrade-matrix.yaml +++ b/.github/workflows/test-upgrade-matrix.yaml @@ -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: diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml index 4de0619a..45fcc1f0 100644 --- a/.github/workflows/test-upgrade.yaml +++ b/.github/workflows/test-upgrade.yaml @@ -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 diff --git a/REFERENCE.md b/REFERENCE.md index f9151023..b90c00a8 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -1826,7 +1826,6 @@ Data type: `Peadm::Pe_version` -Default value: `'2021.7.4'` ##### `dns_alt_names` diff --git a/documentation/install.md b/documentation/install.md index 210b8661..614c8aaf 100644 --- a/documentation/install.md +++ b/documentation/install.md @@ -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.5.0" } ``` diff --git a/plans/install.pp b/plans/install.pp index f6ac00a4..4c0ea41e 100644 --- a/plans/install.pp +++ b/plans/install.pp @@ -45,7 +45,7 @@ # Common Configuration String $console_password, - Peadm::Pe_version $version = '2021.7.4', + Peadm::Pe_version $version, Optional[String] $pe_installer_source = undef, Optional[Array[String]] $dns_alt_names = undef, Optional[String] $compiler_pool_address = undef, diff --git a/spec/functions/assert_supported_pe_version_spec.rb b/spec/functions/assert_supported_pe_version_spec.rb index 857acdc6..5d0d0685 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.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 diff --git a/spec/plans/convert_spec.rb b/spec/plans/convert_spec.rb index 1c28a828..bf94dc8b 100644 --- a/spec/plans/convert_spec.rb +++ b/spec/plans/convert_spec.rb @@ -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({}) diff --git a/spec/plans/install_spec.rb b/spec/plans/install_spec.rb index 5d98b0b8..030428fd 100644 --- a/spec/plans/install_spec.rb +++ b/spec/plans/install_spec.rb @@ -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 diff --git a/spec/plans/upgrade_spec.rb b/spec/plans/upgrade_spec.rb index b4a54d2a..53f26d54 100644 --- a/spec/plans/upgrade_spec.rb +++ b/spec/plans/upgrade_spec.rb @@ -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 @@ -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