Merge pull request #406 from puppetlabs/PE-37192_UpdateDefaultVersion2021.7.4-2021.7.6

ragingra · web-flow · commit 14ccfb337cce · 2023-11-23T14:52:50.000Z
(PE-37192) Updating default install version to 2021.7.6
diff --git 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
@@ -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
@@ -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
@@ -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-fips-install-matrix.yaml b/.github/workflows/test-fips-install-matrix.yaml
@@ -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
diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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`
 
diff --git 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.7.6"
 }
 ```
 
diff --git 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                          = '2021.7.6',
   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
@@ -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
@@ -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
@@ -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
@@ -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
