From 79e9c190d3b5e1d5cc04b3d61bed36633382515f Mon Sep 17 00:00:00 2001
From: martyewings <martyewings@gmail.com>
Date: Thu, 1 Jul 2021 15:27:15 +0100
Subject: [PATCH] PE Version and PDK Update

---
 .github/workflows/pe_latest_testing.yml |  2 +-
 .github/workflows/pe_lts_testing.yml    |  2 +-
 .gitignore                              |  1 +
 .pdkignore                              |  2 ++
 metadata.json                           |  8 ++++----
 spec/spec_helper.rb                     | 12 ++++++++++++
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pe_latest_testing.yml b/.github/workflows/pe_latest_testing.yml
index 658c430..fa95d67 100644
--- a/.github/workflows/pe_latest_testing.yml
+++ b/.github/workflows/pe_latest_testing.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
-          echo  "::set-output name=matrix::{\"platforms\":[{\"label\":\"CentOS-8\",\"provider\":\"provision::provision_service\",\"image\":\"centos-8\"},{\"label\":\"Ubuntu-1804\",\"provider\":\"provision::provision_service\",\"image\":\"ubuntu-1804-lts\"}],\"collection\":[\"2021.1.0\"]}"
+          echo  "::set-output name=matrix::{\"platforms\":[{\"label\":\"CentOS-7\",\"provider\":\"provision::provision_service\",\"image\":\"centos-7\"},{\"label\":\"CentOS-8\",\"provider\":\"provision::provision_service\",\"image\":\"centos-8\"},{\"label\":\"RedHat-7\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-7\"},{\"label\":\"Ubuntu-1804\",\"provider\":\"provision::provision_service\",\"image\":\"ubuntu-1804-lts\"},{\"label\":\"RedHat-8\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-8\"}],\"collection\":[\"2021.2.0\"]}"
     - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
diff --git a/.github/workflows/pe_lts_testing.yml b/.github/workflows/pe_lts_testing.yml
index df1ca02..0445478 100644
--- a/.github/workflows/pe_lts_testing.yml
+++ b/.github/workflows/pe_lts_testing.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Setup Acceptance Test Matrix
       id: get-matrix
       run: |
-          echo  "::set-output name=matrix::{\"platforms\":[{\"label\":\"CentOS-7\",\"provider\":\"provision::provision_service\",\"image\":\"centos-7\"},{\"label\":\"CentOS-8\",\"provider\":\"provision::provision_service\",\"image\":\"centos-8\"},{\"label\":\"RedHat-7\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-7\"},{\"label\":\"Ubuntu-1804\",\"provider\":\"provision::provision_service\",\"image\":\"ubuntu-1804-lts\"}],\"collection\":[\"2019.8.6\"]}"
+          echo  "::set-output name=matrix::{\"platforms\":[{\"label\":\"CentOS-7\",\"provider\":\"provision::provision_service\",\"image\":\"centos-7\"},{\"label\":\"CentOS-8\",\"provider\":\"provision::provision_service\",\"image\":\"centos-8\"},{\"label\":\"RedHat-7\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-7\"},{\"label\":\"Ubuntu-1804\",\"provider\":\"provision::provision_service\",\"image\":\"ubuntu-1804-lts\"},{\"label\":\"RedHat-8\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-8\"}],\"collection\":[\"2019.8.7\"]}"
     - name: "Honeycomb: Record Setup Test Matrix time"
       if: ${{ always() }}
       run: |
diff --git a/.gitignore b/.gitignore
index 2767022..988dcbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 .project
 .envrc
 /inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
diff --git a/.pdkignore b/.pdkignore
index a74c4c4..c538bea 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -25,7 +25,9 @@
 .project
 .envrc
 /inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
 /appveyor.yml
+/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
diff --git a/metadata.json b/metadata.json
index 3f392ac..1f06c23 100644
--- a/metadata.json
+++ b/metadata.json
@@ -50,10 +50,10 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.0 < 8.0.0"
+      "version_requirement": ">= 6.16.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.1.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#2.1.0",
-  "template-ref": "tags/2.1.0-0-ga675ea5"
+  "pdk-version": "2.1.1",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#2.1.1",
+  "template-ref": "tags/2.1.1-0-g03daa92"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 16764b6..07db734 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -48,6 +48,18 @@
   c.after(:suite) do
     RSpec::Puppet::Coverage.report!(0)
   end
+
+  # Filter backtrace noise
+  backtrace_exclusion_patterns = [
+    %r{spec_helper},
+    %r{gems},
+  ]
+
+  if c.respond_to?(:backtrace_exclusion_patterns)
+    c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
+  elsif c.respond_to?(:backtrace_clean_patterns)
+    c.backtrace_clean_patterns = backtrace_exclusion_patterns
+  end
 end
 
 # Ensures that a module is defined