From 9a3b22bf085381d450a565947cc078cb910f4032 Mon Sep 17 00:00:00 2001
From: Reid Vandewiele <reid@puppet.com>
Date: Tue, 1 Mar 2022 07:55:17 -0800
Subject: [PATCH] Support PE 2021.5, 2019.8.10

Modify assert_supported_pe_version function, README, and CI matrices
---
 .github/workflows/test-install-matrix.yaml | 4 ++--
 .github/workflows/test-install.yaml        | 2 +-
 .github/workflows/test-upgrade.yaml        | 4 ++--
 README.md                                  | 2 +-
 documentation/install.md                   | 2 +-
 functions/assert_supported_pe_version.pp   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
index 70205552..6fa42909 100644
--- a/.github/workflows/test-install-matrix.yaml
+++ b/.github/workflows/test-install-matrix.yaml
@@ -28,8 +28,8 @@ jobs:
           - large
           - extra-large-with-dr
         version:
-          - 2019.8.9
-          - 2021.4.0
+          - 2019.8.10
+          - 2021.5.0
         image:
           - centos-7
 
diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml
index d05e93a9..5525184e 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.4.0'
+        default: '2021.5.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
index a268c503..7fba49bc 100644
--- a/.github/workflows/test-upgrade.yaml
+++ b/.github/workflows/test-upgrade.yaml
@@ -27,9 +27,9 @@ jobs:
           - 'standard'
           - 'extra-large-with-dr'
         version:
-          - '2019.8.9'
+          - '2019.8.10'
         version_to_upgrade:
-          - '2021.4.0'
+          - '2021.5.0'
         image:
           - 'centos-7'
         download_mode:
diff --git a/README.md b/README.md
index 0fa59c2a..4f95d34e 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ The normal usage pattern for peadm is as follows.
 
 ### Requirements
 
-* Puppet Enterprise 2019.8.1 or newer (tested with PE 2021.4)
+* Puppet Enterprise 2019.8.1 or newer (tested with PE 2021.5)
 * Bolt 3.17.0 or newer (tested with Bolt 3.21.0)
 * EL 7, EL 8, Ubuntu 18.04, or Ubuntu 20.04
 * Classifier Data enabled. This PE feature is enabled by default on new installs, but can be disabled by users if they remove the relevant configuration from their global hiera.yaml file. See the [PE docs](https://puppet.com/docs/pe/latest/config_console.html#task-5039) for more information.
diff --git a/documentation/install.md b/documentation/install.md
index 8341e19f..4a74a4a5 100644
--- a/documentation/install.md
+++ b/documentation/install.md
@@ -103,7 +103,7 @@ Example params.json Bolt parameters file (shown: Extra Large with DR):
   "console_password": "puppetlabs",
   "dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],
   "compiler_pool_address": "puppet.lab1.puppet.vm",
-  "version": "2021.4.0"
+  "version": "2021.5.0"
 }
 ```
 
diff --git a/functions/assert_supported_pe_version.pp b/functions/assert_supported_pe_version.pp
index 2d8775bd..7b945ca0 100644
--- a/functions/assert_supported_pe_version.pp
+++ b/functions/assert_supported_pe_version.pp
@@ -6,7 +6,7 @@ function peadm::assert_supported_pe_version (
   Boolean $permit_unsafe_versions = false,
 ) >> Struct[{'supported' => Boolean}] {
   $oldest = '2019.7'
-  $newest = '2021.4'
+  $newest = '2021.5'
   $supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))
 
   if $permit_unsafe_versions {