Skip to content

Commit 129b3b6

Browse files
markasammutmarkasammut
authored
Merge branch 'puppetlabs:main' into main
2 parents fc71294 + cc5df33 commit 129b3b6

File tree

7 files changed

+44
-31
lines changed

7 files changed

+44
-31
lines changed

‎.github/workflows/auto_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
runs-on: ubuntu-20.04
1515

1616
steps:
17+
1718
- name: "Honeycomb: Start recording"
1819
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
1920
with:
@@ -25,7 +26,6 @@ jobs:
2526
run: |
2627
echo STEP_ID="auto-release" >> $GITHUB_ENV
2728
echo STEP_START=$(date +%s) >> $GITHUB_ENV
28-
2929
- name: "Checkout Source"
3030
if: ${{ github.repository_owner == 'puppetlabs' }}
3131
uses: actions/checkout@v2
@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
8585
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
86-
86+
8787
- name: "Honeycomb: Record finish step"
8888
if: ${{ always() }}
8989
run: |

‎.github/workflows/nightly.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
schedule:
55
- cron: '0 0 * * *'
66

7+
78
env:
89
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
910
HONEYCOMB_DATASET: litmus tests
@@ -16,6 +17,7 @@ jobs:
1617
matrix: ${{ steps.get-matrix.outputs.matrix }}
1718

1819
steps:
20+
1921
- name: "Honeycomb: Start recording"
2022
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
2123
with:
@@ -27,7 +29,6 @@ jobs:
2729
run: |
2830
echo STEP_ID=setup-environment >> $GITHUB_ENV
2931
echo STEP_START=$(date +%s) >> $GITHUB_ENV
30-
3132
- name: Checkout Source
3233
uses: actions/checkout@v2
3334
if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -45,29 +46,27 @@ jobs:
4546
echo ::group::bundler environment
4647
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
4748
echo ::endgroup::
48-
49+
4950
- name: "Honeycomb: Record Setup Environment time"
5051
if: ${{ github.repository_owner == 'puppetlabs' }}
5152
run: |
5253
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5354
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5455
echo STEP_START=$(date +%s) >> $GITHUB_ENV
55-
5656
- name: Setup Acceptance Test Matrix
5757
id: get-matrix
5858
if: ${{ github.repository_owner == 'puppetlabs' }}
5959
run: |
6060
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
61-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
61+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["Debian-9", "Debian-10", "Debian-11"]'
6262
else
6363
echo "::set-output name=matrix::{}"
6464
fi
65-
65+
6666
- name: "Honeycomb: Record Setup Test Matrix time"
6767
if: ${{ always() }}
6868
run: |
6969
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
70-
7170
Acceptance:
7271
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
7372
needs:

‎.github/workflows/pr_test.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: "PR Testing"
22

33
on: [pull_request]
44

5+
56
env:
7+
68
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
79
HONEYCOMB_DATASET: litmus tests
810

@@ -14,6 +16,7 @@ jobs:
1416
matrix: ${{ steps.get-matrix.outputs.matrix }}
1517

1618
steps:
19+
1720
- name: "Honeycomb: Start recording"
1821
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
1922
with:
@@ -25,7 +28,6 @@ jobs:
2528
run: |
2629
echo STEP_ID=setup-environment >> $GITHUB_ENV
2730
echo STEP_START=$(date +%s) >> $GITHUB_ENV
28-
2931
- name: Checkout Source
3032
uses: actions/checkout@v2
3133
if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -43,14 +45,13 @@ jobs:
4345
echo ::group::bundler environment
4446
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
4547
echo ::endgroup::
46-
48+
4749
- name: "Honeycomb: Record Setup Environment time"
4850
if: ${{ github.repository_owner == 'puppetlabs' }}
4951
run: |
5052
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5153
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5254
echo STEP_START=$(date +%s) >> $GITHUB_ENV
53-
5455
- name: Run validation steps
5556
run: |
5657
bundle exec rake validate
@@ -60,16 +61,15 @@ jobs:
6061
id: get-matrix
6162
run: |
6263
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
63-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
64+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 --exclude-platforms '["Debian-9", "Debian-10", "Debian-11"]'
6465
else
6566
echo "::set-output name=matrix::{}"
6667
fi
67-
68+
6869
- name: "Honeycomb: Record Setup Test Matrix time"
6970
if: ${{ always() }}
7071
run: |
7172
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
72-
7373
Acceptance:
7474
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
7575
needs:
@@ -89,7 +89,7 @@ jobs:
8989
echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
9090
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
9191
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
92-
92+
9393
- name: "Honeycomb: Start recording"
9494
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
9595
with:
@@ -102,7 +102,6 @@ jobs:
102102
run: |
103103
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
104104
echo STEP_START=$(date +%s) >> $GITHUB_ENV
105-
106105
- name: Checkout Source
107106
uses: actions/checkout@v2
108107

@@ -117,14 +116,13 @@ jobs:
117116
echo ::group::bundler environment
118117
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
119118
echo ::endgroup::
120-
119+
121120
- name: "Honeycomb: Record Setup Environment time"
122121
if: ${{ always() }}
123122
run: |
124123
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
125124
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
126125
echo STEP_START=$(date +%s) >> $GITHUB_ENV
127-
128126
- name: Provision test environment
129127
run: |
130128
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
@@ -150,7 +148,7 @@ jobs:
150148
- name: Install module
151149
run: |
152150
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
153-
151+
154152
- name: "Honeycomb: Record deployment times"
155153
if: ${{ always() }}
156154
run: |
@@ -159,18 +157,16 @@ jobs:
159157
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
160158
echo STEP_START=$(date +%s) >> $GITHUB_ENV
161159
echo ::endgroup::
162-
163160
- name: Run acceptance tests
164161
run: |
165162
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
166-
163+
167164
- name: "Honeycomb: Record acceptance testing times"
168165
if: ${{ always() }}
169166
run: |
170167
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
171168
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
172169
echo STEP_START=$(date +%s) >> $GITHUB_ENV
173-
174170
- name: Remove test environment
175171
if: ${{ always() }}
176172
continue-on-error: true
@@ -182,7 +178,7 @@ jobs:
182178
echo
183179
echo ::endgroup::
184180
fi
185-
181+
186182
- name: "Honeycomb: Record removal times"
187183
if: ${{ always() }}
188184
run: |

‎.github/workflows/spec.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
workflow_dispatch:
77
pull_request:
88

9+
910
env:
1011
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
1112
HONEYCOMB_DATASET: litmus tests
@@ -18,6 +19,7 @@ jobs:
1819
spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
1920

2021
steps:
22+
2123
- name: "Honeycomb: Start recording"
2224
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
2325
with:
@@ -29,7 +31,6 @@ jobs:
2931
run: |
3032
echo STEP_ID=setup-environment >> $GITHUB_ENV
3133
echo STEP_START=$(date +%s) >> $GITHUB_ENV
32-
3334
- name: Checkout Source
3435
uses: actions/checkout@v2
3536
if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -47,14 +48,12 @@ jobs:
4748
echo ::group::bundler environment
4849
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
4950
echo ::endgroup::
50-
5151
- name: "Honeycomb: Record Setup Environment time"
5252
if: ${{ github.repository_owner == 'puppetlabs' }}
5353
run: |
5454
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5555
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5656
echo STEP_START=$(date +%s) >> $GITHUB_ENV
57-
5857
- name: Run Static & Syntax Tests
5958
if: ${{ github.repository_owner == 'puppetlabs' }}
6059
run: |
@@ -68,12 +67,10 @@ jobs:
6867
else
6968
echo "::set-output name=spec_matrix::{}"
7069
fi
71-
7270
- name: "Honeycomb: Record Setup Test Matrix time"
7371
if: ${{ always() }}
7472
run: |
7573
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
76-
7774
Spec:
7875
name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
7976
needs:
@@ -96,7 +93,6 @@ jobs:
9693
9794
- run: |
9895
echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
99-
10096
- name: "Honeycomb: Start first step"
10197
run: |
10298
echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
@@ -109,7 +105,6 @@ jobs:
109105
dataset: ${{ env.HONEYCOMB_DATASET }}
110106
job-status: ${{ job.status }}
111107
matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
112-
113108
- name: Checkout Source
114109
uses: actions/checkout@v2
115110

‎.sync.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,16 @@ Rakefile:
2121
unmanaged: false
2222
.github/workflows/nightly.yml:
2323
unmanaged: false
24+
exclude_platforms:
25+
- Debian-9
26+
- Debian-10
27+
- Debian-11
2428
.github/workflows/pr_test.yml:
2529
unmanaged: false
30+
exclude_platforms:
31+
- Debian-9
32+
- Debian-10
33+
- Debian-11
2634
.github/workflows/auto_release.yml:
2735
unmanaged: false
2836
.github/workflows/spec.yml:

‎Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ end
4343

4444
PuppetLint.configuration.send('disable_relative')
4545

46+
4647
if Bundler.rubygems.find_name('github_changelog_generator').any?
4748
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
4849
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?

‎metadata.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@
3737
"7"
3838
]
3939
},
40+
{
41+
"operatingsystem": "Debian",
42+
"operatingsystemrelease": [
43+
"9",
44+
"10",
45+
"11"
46+
]
47+
},
4048
{
4149
"operatingsystem": "Scientific",
4250
"operatingsystemrelease": [
@@ -58,6 +66,12 @@
5866
"18.04",
5967
"20.04"
6068
]
69+
},
70+
{
71+
"operatingsystem": "Rocky",
72+
"operatingsystemrelease": [
73+
"8"
74+
]
6175
}
6276
],
6377
"requirements": [
@@ -68,6 +82,6 @@
6882
],
6983
"description": "MySQL module",
7084
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
71-
"template-ref": "heads/main-0-g51828b4",
85+
"template-ref": "heads/main-0-gbd3742c",
7286
"pdk-version": "2.2.0"
7387
}

0 commit comments

Comments
 (0)