update versions

timidri · timidri · commit 294e8429d96f · 2022-09-09T12:33:09.000+02:00
add pause after provisioning for debugging
diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml
@@ -7,15 +7,15 @@ on:
       image:
         description: 'GCP image for test cluster'
         required: true
-        default: 'centos-7'
+        default: 'almalinux-cloud/almalinux-8'
       architecture:
         description: 'PE architecture to test'
         required: true
         default: 'standard'
       version:
         description: 'PE version to install'
         required: true
-        default: '2019.8.8'
+        default: '2021.7.0'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
@@ -32,7 +32,7 @@ jobs:
           - 2021.7.0
         image:
           - centos-7
-
+          - almalinux-cloud/almalinux-8
     steps:
       - name: "Honeycomb: Start recording"
         uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
@@ -99,6 +99,8 @@ jobs:
             sed -e 's/password: .*/password: "[redacted]"/' < spec/fixtures/litmus_inventory.yaml || true
           echo ::endgroup::
 
+          touch ${HOME}/pause
+
       - name: "Honeycomb: Record provision time"
         if: ${{ always() }}
         run: |
diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml
@@ -7,15 +7,15 @@ on:
       image:
         description: 'GCP image for test cluster'
         required: true
-        default: 'centos-7'
+        default: 'almalinux-cloud/almalinux-8'
       architecture:
         description: 'PE architecture to test'
         required: true
         default: 'standard'
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.6.0'
+        default: '2021.7.0'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml
@@ -31,7 +31,7 @@ jobs:
         version_to_upgrade:
           - '2021.7.0'
         image:
-          - 'centos-7'
+          - 'almalinux-cloud/almalinux-8'
         download_mode:
           - 'direct'
 
diff --git a/documentation/install.md b/documentation/install.md
@@ -168,7 +168,7 @@ A parameters JSON file can then reference the target names, which will become th
   "console_password": "puppetlabs",
   "dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],
   "compiler_pool_address": "puppet.lab1.puppet.vm",
-  "version": "2019.2.2"
+  "version": "2021.7.0"
 }
 ```
 
diff --git a/documentation/upgrade.md b/documentation/upgrade.md
@@ -10,7 +10,7 @@ The following is an example parameters file for upgrading an Extra Large archite
 
 ```json
 {
-  "version": "2019.2.2",
+  "version": "2021.7.0",
   "primary_host": "pe-master-09a40c-0.us-west1-a.c.reidmv-peadm.internal",
   "primary_postgresql_host": "pe-psql-09a40c-0.us-west1-a.c.reidmv-peadm.internal",
   "replica_host": "pe-master-09a40c-1.us-west1-b.c.reidmv-peadm.internal",
diff --git a/examples/provision/extra-large-ha.json b/examples/provision/extra-large-ha.json
@@ -1,5 +1,5 @@
 {
-  "version": "2019.4.0",
+  "version": "2021.7.0",
   "console_password": "puppetlabs",
   "primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
   "replica_host": "pe-master-1830cd-1.us-west1-b.c.reidmv-peadm.internal",
diff --git a/examples/provision/extra-large.json b/examples/provision/extra-large.json
@@ -1,5 +1,5 @@
 {
-  "version": "2019.2.4",
+  "version": "2021.7.0",
   "console_password": "puppetlabs",
   "primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
 
diff --git a/examples/provision/large-ha.json b/examples/provision/large-ha.json
@@ -1,5 +1,5 @@
 {
-  "version": "2019.4.0",
+  "version": "2021.7.0",
   "console_password": "puppetlabs",
   "primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
   "replica_host": "pe-master-1830cd-1.us-west1-b.c.reidmv-peadm.internal",
diff --git a/examples/provision/large.json b/examples/provision/large.json
@@ -1,5 +1,5 @@
 {
-  "version": "2019.4.0",
+  "version": "2021.7.0",
   "console_password": "puppetlabs",
   "primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
 
diff --git a/examples/provision/minimal.json b/examples/provision/minimal.json
@@ -1,5 +1,5 @@
 {
-  "version": "2019.4.0",
+  "version": "2021.7.0",
   "console_password": "puppetlabs",
   "primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal"
 }
diff --git a/examples/provision/standard-ha.json b/examples/provision/standard-ha.json
@@ -1,5 +1,5 @@
 {
-  "version": "2019.4.0",
+  "version": "2021.7.0",
   "console_password": "puppetlabs",
   "primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
   "replica_host": "pe-master-1830cd-1.us-west1-b.c.reidmv-peadm.internal",
diff --git a/examples/provision/standard.json b/examples/provision/standard.json
@@ -1,5 +1,5 @@
 {
-  "version": "2019.4.0",
+  "version": "2021.7.0",
   "console_password": "puppetlabs",
   "primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
 
diff --git a/plans/install.pp b/plans/install.pp
@@ -36,7 +36,7 @@
 
   # Common Configuration
   String                            $console_password,
-  Peadm::Pe_version                 $version                          = '2019.8.8',
+  Peadm::Pe_version                 $version                          = '2021.7.0',
   Optional[String]                  $pe_installer_source              = undef,
   Optional[Array[String]]           $dns_alt_names                    = undef,
   Optional[String]                  $compiler_pool_address            = undef,
diff --git a/spec/docker/extra-large-ha/params.json b/spec/docker/extra-large-ha/params.json
@@ -12,6 +12,6 @@
     "pe-xl-core-0.puppet.vm",
     "puppet-xl.vm"
   ],
-  "version": "2019.8.5",
+  "version": "2021.7.0",
   "compiler_pool_address": "puppet-xl.vm"
 }
diff --git a/spec/docker/extra-large-ha/upgrade_params.json b/spec/docker/extra-large-ha/upgrade_params.json
@@ -6,5 +6,5 @@
   "compiler_hosts": [
     "pe-xl-compiler-0.puppet.vm"
   ],
-  "version": "2019.8.5"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/extra-large/params.json b/spec/docker/extra-large/params.json
@@ -9,5 +9,5 @@
     "puppet",
     "pe-xl-core-0.puppet.vm"
   ],
-  "version": "2019.8.5"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/extra-large/upgrade_params.json b/spec/docker/extra-large/upgrade_params.json
@@ -2,5 +2,5 @@
     "primary_host": "pe-xl-core-0.puppet.vm",
     "primary_postgresql_host": "pe-xl-db-0.puppet.vm",
     "compiler_hosts": ["pe-xl-compiler-0.puppet.vm"],
-    "version": "2019.8.5" 
+    "version": "2021.7.0" 
 }
diff --git a/spec/docker/large-ha/params.json b/spec/docker/large-ha/params.json
@@ -9,5 +9,5 @@
     "puppet",
     "pe-lg.puppet.vm"
   ],
-  "version": "2019.8.5"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/large-ha/upgrade_params.json b/spec/docker/large-ha/upgrade_params.json
@@ -4,5 +4,5 @@
   "compiler_hosts": [
     "pe-lg-compiler-0.puppet.vm"
   ],
-  "version": "2019.8.5"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/large/params.json b/spec/docker/large/params.json
@@ -8,5 +8,5 @@
     "puppet",
     "pe-lg.puppet.vm"
   ],
-  "version": "2019.8.1"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/large/upgrade_params.json b/spec/docker/large/upgrade_params.json
@@ -3,5 +3,5 @@
   "compiler_hosts": [
     "pe-lg-compiler-0.puppet.vm"
   ],
-  "version": "2019.8.8"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/standard-ha/params.json b/spec/docker/standard-ha/params.json
@@ -6,5 +6,5 @@
     "puppet",
     "pe-std.puppet.vm"
   ],
-  "version": "2019.8.5"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/standard-ha/upgrade_params.json b/spec/docker/standard-ha/upgrade_params.json
@@ -1,5 +1,5 @@
 {
   "primary_host": "pe-std.puppet.vm",
   "replica_host": "pe-std-replica.puppet.vm",
-  "version": "2019.8.5"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/standard/params.json b/spec/docker/standard/params.json
@@ -5,5 +5,5 @@
     "puppet",
     "pe-std.puppet.vm"
   ],
-  "version": "2019.8.8"
+  "version": "2021.7.0"
 }
diff --git a/spec/docker/standard/upgrade_params.json b/spec/docker/standard/upgrade_params.json
@@ -1,4 +1,4 @@
 {
   "primary_host": "pe-std.puppet.vm",
-  "version": "2019.8.8"
+  "version": "2021.7.0"
 }
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.2.1').and_return({ 'supported' => true })
+      is_expected.to run.with_params('2021.7.0').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' => '2019.2.4' })
+    expect_task('peadm::read_file').always_return({ 'content' => '2021.7.0' })
 
     # For some reason, expect_plan() was not working??
     allow_plan('peadm::modify_certificate').always_return({})
diff --git a/spec/plans/subplans/install_spec.rb b/spec/plans/subplans/install_spec.rb
@@ -39,7 +39,7 @@
     params = {
       'primary_host'     => 'primary',
       'console_password' => 'puppetlabs',
-      'version'          => '2019.8.11',
+      'version'          => '2019.8.12',
     }
 
     expect(run_plan('peadm::subplans::install', params)).to be_ok
diff --git a/spec/plans/upgrade_spec.rb b/spec/plans/upgrade_spec.rb
@@ -28,7 +28,7 @@ def allow_standard_non_returning_calls
 
     expect(run_plan('peadm::upgrade',
                     'primary_host' => 'primary',
-                    'version' => '2019.8.6')).to be_ok
+                    'version' => '2021.7.0')).to be_ok
   end
 
   it 'runs with a primary, compilers, but no replica' do
@@ -41,6 +41,6 @@ def allow_standard_non_returning_calls
     expect(run_plan('peadm::upgrade',
                     'primary_host' => 'primary',
                     'compiler_hosts' => 'compiler',
-                    'version' => '2019.8.6')).to be_ok
+                    'version' => '2021.7.0')).to be_ok
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ A parameters JSON file can then reference the target names, which will become th`
`168`	`168`	`"console_password": "puppetlabs",`
`169`	`169`	`"dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],`
`170`	`170`	`"compiler_pool_address": "puppet.lab1.puppet.vm",`
`171`		`- "version": "2019.2.2"`
	`171`	`+ "version": "2021.7.0"`
`172`	`172`	`}`
`173`	`173`	```
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ The following is an example parameters file for upgrading an Extra Large archite`
`10`	`10`
`11`	`11`	```json
`12`	`12`	`{`
`13`		`- "version": "2019.2.2",`
	`13`	`+ "version": "2021.7.0",`
`14`	`14`	`"primary_host": "pe-master-09a40c-0.us-west1-a.c.reidmv-peadm.internal",`
`15`	`15`	`"primary_postgresql_host": "pe-psql-09a40c-0.us-west1-a.c.reidmv-peadm.internal",`
`16`	`16`	`"replica_host": "pe-master-09a40c-1.us-west1-b.c.reidmv-peadm.internal",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "2019.4.0",`
	`2`	`+ "version": "2021.7.0",`
`3`	`3`	`"console_password": "puppetlabs",`
`4`	`4`	`"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",`
`5`	`5`	`"replica_host": "pe-master-1830cd-1.us-west1-b.c.reidmv-peadm.internal",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "2019.2.4",`
	`2`	`+ "version": "2021.7.0",`
`3`	`3`	`"console_password": "puppetlabs",`
`4`	`4`	`"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",`
`5`	`5`