Skip to content

Commit 514e19f

Browse files
committed
(maint) pdk template update
1 parent f51fabd commit 514e19f

File tree

16 files changed

+43
-313
lines changed

16 files changed

+43
-313
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

.devcontainer/README.md

Lines changed: 0 additions & 38 deletions
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

.geppetto-rc.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 5 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -9,95 +9,11 @@ on:
99
jobs:
1010
Spec:
1111
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
12-
with:
13-
runs_on: "ubuntu-20.04"
1412
secrets: "inherit"
1513

16-
setup_matrix:
17-
name: "Setup Test Matrix"
18-
needs: "Spec"
19-
runs-on: ubuntu-20.04
20-
outputs:
21-
matrix: ${{ steps.get-matrix.outputs.matrix }}
22-
23-
steps:
24-
- name: Checkout Source
25-
uses: actions/checkout@v3
26-
27-
- name: Activate Ruby 2.7
28-
uses: ruby/setup-ruby@v1
29-
with:
30-
ruby-version: "2.7"
31-
bundler-cache: true
32-
33-
- name: Print bundle environment
34-
run: |
35-
echo ::group::bundler environment
36-
bundle env
37-
echo ::endgroup::
38-
39-
- name: Setup Acceptance Test Matrix
40-
id: get-matrix
41-
run: |
42-
bundle exec matrix_from_metadata_v2 --exclude-platforms '["Ubuntu-22.04-arm", "RedHat-9-arm"]'
43-
4414
Acceptance:
45-
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
46-
needs:
47-
- setup_matrix
48-
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
49-
50-
runs-on: ubuntu-20.04
51-
strategy:
52-
fail-fast: false
53-
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
54-
55-
env:
56-
PUPPET_GEM_VERSION: '~> 7.24'
57-
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
58-
59-
steps:
60-
- name: Checkout Source
61-
uses: actions/checkout@v3
62-
63-
- name: Activate Ruby 2.7
64-
uses: ruby/setup-ruby@v1
65-
with:
66-
ruby-version: "2.7"
67-
bundler-cache: true
68-
69-
- name: Print bundle environment
70-
run: |
71-
bundle env
72-
73-
- name: "Disable mysqld apparmor profile"
74-
if: ${{matrix.platforms.provider == 'docker'}}
75-
run: |
76-
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
77-
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
78-
sudo systemctl disable apparmor
79-
sudo systemctl stop apparmor
80-
81-
- name: Provision test environment
82-
run: |
83-
bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
84-
FILE='spec/fixtures/litmus_inventory.yaml'
85-
sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
86-
87-
- name: Install agent
88-
run: |
89-
bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
90-
91-
- name: Install module
92-
run: |
93-
bundle exec rake 'litmus:install_module'
94-
95-
- name: Run acceptance tests
96-
run: |
97-
bundle exec rake 'litmus:acceptance:parallel'
98-
99-
- name: Remove test environment
100-
if: ${{ always() }}
101-
continue-on-error: true
102-
run: |
103-
bundle exec rake 'litmus:tear_down'
15+
needs: Spec
16+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
17+
secrets: "inherit"
18+
with:
19+
runs_on: ubuntu-20.04

.github/workflows/nightly.yml

Lines changed: 3 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -8,95 +8,9 @@ on:
88
jobs:
99
Spec:
1010
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
11-
with:
12-
runs_on: "ubuntu-20.04"
1311
secrets: "inherit"
1412

15-
setup_matrix:
16-
name: "Setup Test Matrix"
17-
needs: "Spec"
18-
runs-on: ubuntu-20.04
19-
outputs:
20-
matrix: ${{ steps.get-matrix.outputs.matrix }}
21-
22-
steps:
23-
- name: Checkout Source
24-
uses: actions/checkout@v3
25-
26-
- name: Activate Ruby 2.7
27-
uses: ruby/setup-ruby@v1
28-
with:
29-
ruby-version: "2.7"
30-
bundler-cache: true
31-
32-
- name: Print bundle environment
33-
run: |
34-
echo ::group::bundler environment
35-
bundle env
36-
echo ::endgroup::
37-
38-
- name: Setup Acceptance Test Matrix
39-
id: get-matrix
40-
run: |
41-
bundle exec matrix_from_metadata_v2 --exclude-platforms '["Ubuntu-22.04-arm", "RedHat-9-arm"]'
42-
4313
Acceptance:
44-
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
45-
needs:
46-
- setup_matrix
47-
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
48-
49-
runs-on: ubuntu-20.04
50-
strategy:
51-
fail-fast: false
52-
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
53-
54-
env:
55-
PUPPET_GEM_VERSION: '~> 7.24'
56-
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
57-
58-
steps:
59-
- name: Checkout Source
60-
uses: actions/checkout@v3
61-
62-
- name: Activate Ruby 2.7
63-
uses: ruby/setup-ruby@v1
64-
with:
65-
ruby-version: "2.7"
66-
bundler-cache: true
67-
68-
- name: Print bundle environment
69-
run: |
70-
bundle env
71-
72-
- name: "Disable mysqld apparmor profile"
73-
if: ${{matrix.platforms.provider == 'docker'}}
74-
run: |
75-
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
76-
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
77-
sudo systemctl disable apparmor
78-
sudo systemctl stop apparmor
79-
80-
- name: Provision test environment
81-
run: |
82-
bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
83-
FILE='spec/fixtures/litmus_inventory.yaml'
84-
sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
85-
86-
- name: Install agent
87-
run: |
88-
bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
89-
90-
- name: Install module
91-
run: |
92-
bundle exec rake 'litmus:install_module'
93-
94-
- name: Run acceptance tests
95-
run: |
96-
bundle exec rake 'litmus:acceptance:parallel'
97-
98-
- name: Remove test environment
99-
if: ${{ always() }}
100-
continue-on-error: true
101-
run: |
102-
bundle exec rake 'litmus:tear_down'
14+
needs: Spec
15+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
16+
secrets: "inherit"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Publish module"
22

33
on:
44
workflow_dispatch:
5-
5+
66
jobs:
77
release:
88
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"

.gitpod.Dockerfile

Lines changed: 0 additions & 18 deletions
This file was deleted.

.gitpod.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.rspec_parallel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--format progress

0 commit comments

Comments
 (0)