Skip to content

Commit a47161a

Browse files
daianamezdreadaianamezdrea
authored
Merge pull request #400 from puppetlabs/pdksync_maint/main/perform_pdk_update
pdksync - (MAINT) PDK update for GHA workflows + Litmus updates
2 parents 123aa53 + a82f5c8 commit a47161a

File tree

4 files changed

+25
-20
lines changed

4 files changed

+25
-20
lines changed

‎.github/workflows/auto_release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ jobs:
4747
if: ${{ github.repository_owner == 'puppetlabs' }}
4848
id: gv
4949
run: |
50-
echo "::set-output name=ver::$(cat metadata.json | jq .version | tr -d \")"
50+
echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
5151
5252
- name: "Commit changes"
5353
if: ${{ github.repository_owner == 'puppetlabs' }}
5454
run: |
55-
git config --local user.email "action@github.com"
55+
git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
5656
git config --local user.name "GitHub Action"
5757
git add .
5858
git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
@@ -67,7 +67,7 @@ jobs:
6767
branch: "release-prep"
6868
delete-branch: true
6969
title: "Release prep v${{ steps.gv.outputs.ver }}"
70-
body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb)"
70+
body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}"
7171
labels: "maintenance"
7272

7373
- name: PR outputs

‎.github/workflows/nightly.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
if: ${{ github.repository_owner == 'puppetlabs' }}
6060
run: |
6161
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
62-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
62+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
6363
else
6464
echo "::set-output name=matrix::{}"
6565
fi
@@ -70,6 +70,7 @@ jobs:
7070
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
7171
7272
Acceptance:
73+
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
7374
needs:
7475
- setup_matrix
7576

@@ -83,20 +84,22 @@ jobs:
8384

8485
steps:
8586
- run: |
86-
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
87+
echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
8788
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
89+
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
90+
8891
8992
- name: "Honeycomb: Start recording"
9093
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
9194
with:
9295
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
9396
dataset: ${{ env.HONEYCOMB_DATASET }}
9497
job-status: ${{ job.status }}
95-
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
98+
matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
9699

97100
- name: "Honeycomb: start first step"
98101
run: |
99-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
102+
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
100103
echo STEP_START=$(date +%s) >> $GITHUB_ENV
101104
102105
- name: Checkout Source
@@ -118,12 +121,12 @@ jobs:
118121
if: ${{ always() }}
119122
run: |
120123
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
121-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
124+
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
122125
echo STEP_START=$(date +%s) >> $GITHUB_ENV
123126
124127
- name: Provision test environment
125128
run: |
126-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
129+
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
127130
echo ::group::=== REQUEST ===
128131
cat request.json || true
129132
echo
@@ -145,7 +148,7 @@ jobs:
145148
run: |
146149
echo ::group::honeycomb step
147150
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
148-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
151+
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
149152
echo STEP_START=$(date +%s) >> $GITHUB_ENV
150153
echo ::endgroup::
151154
@@ -157,7 +160,7 @@ jobs:
157160
if: ${{ always() }}
158161
run: |
159162
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
160-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
163+
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
161164
echo STEP_START=$(date +%s) >> $GITHUB_ENV
162165
163166
- name: Remove test environment

‎.github/workflows/pr_test.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
id: get-matrix
5757
run: |
5858
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
59-
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
59+
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
6060
else
6161
echo "::set-output name=matrix::{}"
6262
fi
@@ -67,6 +67,7 @@ jobs:
6767
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
6868
6969
Acceptance:
70+
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
7071
needs:
7172
- setup_matrix
7273
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
@@ -81,20 +82,21 @@ jobs:
8182

8283
steps:
8384
- run: |
84-
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
85+
echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
8586
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
87+
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
8688
8789
- name: "Honeycomb: Start recording"
8890
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
8991
with:
9092
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
9193
dataset: ${{ env.HONEYCOMB_DATASET }}
9294
job-status: ${{ job.status }}
93-
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
95+
matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
9496

9597
- name: "Honeycomb: start first step"
9698
run: |
97-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
99+
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
98100
echo STEP_START=$(date +%s) >> $GITHUB_ENV
99101
100102
- name: Checkout Source
@@ -116,12 +118,12 @@ jobs:
116118
if: ${{ always() }}
117119
run: |
118120
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
119-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
121+
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
120122
echo STEP_START=$(date +%s) >> $GITHUB_ENV
121123
122124
- name: Provision test environment
123125
run: |
124-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
126+
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
125127
echo ::group::=== REQUEST ===
126128
cat request.json || true
127129
echo
@@ -143,7 +145,7 @@ jobs:
143145
run: |
144146
echo ::group::honeycomb step
145147
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
146-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
148+
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
147149
echo STEP_START=$(date +%s) >> $GITHUB_ENV
148150
echo ::endgroup::
149151
@@ -155,7 +157,7 @@ jobs:
155157
if: ${{ always() }}
156158
run: |
157159
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
158-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
160+
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
159161
echo STEP_START=$(date +%s) >> $GITHUB_ENV
160162
161163
- name: Remove test environment

‎metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@
9595
],
9696
"description": "This module simply manages /etc/motd or the Windows Logon Message as a template, showing interpolation of system attributes",
9797
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
98-
"template-ref": "heads/main-0-g44cc7ed",
98+
"template-ref": "heads/main-0-g2bf2de6",
9999
"pdk-version": "1.18.1"
100100
}

0 commit comments

Comments
 (0)