Skip to content

Commit 25c1d4e

Browse files
Merge pull request #69 from MartyEwings/pe_update
PE Version and PDK Update
2 parents 1e4372b + a8cf5db commit 25c1d4e

File tree

6 files changed

+21
-5
lines changed

6 files changed

+21
-5
lines changed

.github/workflows/pe_latest_testing.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ jobs:
5353
- name: Setup Acceptance Test Matrix
5454
id: get-matrix
5555
run: |
56-
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\"]}"
56+
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\"},{\"label\":\"RedHat-8\",\"provider\":\"provision::provision_service\",\"image\":\"rhel-8\"}],\"collection\":[\"2021.2.0\"]}"
57+
5758
- name: "Honeycomb: Record Setup Test Matrix time"
5859
if: ${{ always() }}
5960
run: |

.github/workflows/pe_lts_testing.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup Acceptance Test Matrix
5454
id: get-matrix
5555
run: |
56-
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\"]}"
56+
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\"]}"
5757
- name: "Honeycomb: Record Setup Test Matrix time"
5858
if: ${{ always() }}
5959
run: |

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@
2525
.project
2626
.envrc
2727
/inventory.yaml
28+
/spec/fixtures/litmus_inventory.yaml

.pdkignore

+2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
.project
2626
.envrc
2727
/inventory.yaml
28+
/spec/fixtures/litmus_inventory.yaml
2829
/appveyor.yml
30+
/.editorconfig
2931
/.fixtures.yml
3032
/Gemfile
3133
/.gitattributes

metadata.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"version_requirement": ">= 5.5.0 < 8.0.0"
5454
}
5555
],
56-
"pdk-version": "2.1.0",
57-
"template-url": "https://github.com/puppetlabs/pdk-templates#2.1.0",
58-
"template-ref": "tags/2.1.0-0-ga675ea5"
56+
"pdk-version": "2.1.1",
57+
"template-url": "https://github.com/puppetlabs/pdk-templates#2.1.1",
58+
"template-ref": "tags/2.1.1-0-g03daa92"
5959
}

spec/spec_helper.rb

+12
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,18 @@
4848
c.after(:suite) do
4949
RSpec::Puppet::Coverage.report!(0)
5050
end
51+
52+
# Filter backtrace noise
53+
backtrace_exclusion_patterns = [
54+
%r{spec_helper},
55+
%r{gems},
56+
]
57+
58+
if c.respond_to?(:backtrace_exclusion_patterns)
59+
c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
60+
elsif c.respond_to?(:backtrace_clean_patterns)
61+
c.backtrace_clean_patterns = backtrace_exclusion_patterns
62+
end
5163
end
5264

5365
# Ensures that a module is defined

0 commit comments

Comments
 (0)