RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

(MAINT) pdk update

Browse Source
This commit is contained in:
Ciaran McCrisken
2021-02-25 16:14:52 +00:00
parent 91e86c1d11
commit ee6eb4e4a1
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/auto_release.yml vendored
View File

@@ -46,12 +46,12 @@ jobs:
if: ${{ github.repository_owner == 'puppetlabs' }} if: ${{ github.repository_owner == 'puppetlabs' }}
id: gv id: gv
run: | run: |
echo "::set-output name=ver::$(cat metadata.json | jq .version | tr -d \")" echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
- name: "Commit changes" - name: "Commit changes"
if: ${{ github.repository_owner == 'puppetlabs' }} if: ${{ github.repository_owner == 'puppetlabs' }}
run: | run: |
git config --local user.email "action@github.com" git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
git config --local user.name "GitHub Action" git config --local user.name "GitHub Action"
git add . git add .
git commit -m "Release prep v${{ steps.gv.outputs.ver }}" git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
@@ -66,7 +66,7 @@ jobs:
branch: "release-prep" branch: "release-prep"
delete-branch: true delete-branch: true
title: "Release prep v${{ steps.gv.outputs.ver }}" title: "Release prep v${{ steps.gv.outputs.ver }}"
body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb)" 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 }}"
labels: "maintenance" labels: "maintenance"
- name: PR outputs - name: PR outputs

19
.github/workflows/nightly.yml vendored
View File

@@ -58,7 +58,7 @@ jobs:
if: ${{ github.repository_owner == 'puppetlabs' }} if: ${{ github.repository_owner == 'puppetlabs' }}
run: | run: |
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
else else
echo "::set-output name=matrix::{}" echo "::set-output name=matrix::{}"
fi fi
@@ -69,6 +69,7 @@ jobs:
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix' buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
Acceptance: Acceptance:
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
needs: needs:
- setup_matrix - setup_matrix
@@ -82,8 +83,10 @@ jobs:
steps: steps:
- run: | - run: |
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
- name: "Honeycomb: Start recording" - name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1 uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
@@ -91,11 +94,11 @@ jobs:
apikey: ${{ env.HONEYCOMB_WRITEKEY }} apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }} dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }} job-status: ${{ job.status }}
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }} matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
- name: "Honeycomb: start first step" - name: "Honeycomb: start first step"
run: | run: |
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source - name: Checkout Source
@@ -117,12 +120,12 @@ jobs:
if: ${{ always() }} if: ${{ always() }}
run: | run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment' buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Provision test environment - name: Provision test environment
run: | run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]' buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
echo ::group::=== REQUEST === echo ::group::=== REQUEST ===
cat request.json || true cat request.json || true
echo echo
@@ -144,7 +147,7 @@ jobs:
run: | run: |
echo ::group::honeycomb step echo ::group::honeycomb step
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system' buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV echo STEP_START=$(date +%s) >> $GITHUB_ENV
echo ::endgroup:: echo ::endgroup::
@@ -156,7 +159,7 @@ jobs:
if: ${{ always() }} if: ${{ always() }}
run: | run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests' buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Remove test environment - name: Remove test environment

18
.github/workflows/pr_test.yml vendored
View File

@@ -55,7 +55,7 @@ jobs:
id: get-matrix id: get-matrix
run: | run: |
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
else else
echo "::set-output name=matrix::{}" echo "::set-output name=matrix::{}"
fi fi
@@ -66,6 +66,7 @@ jobs:
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix' buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
Acceptance: Acceptance:
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
needs: needs:
- setup_matrix - setup_matrix
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }} if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
@@ -80,8 +81,9 @@ jobs:
steps: steps:
- run: | - run: |
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
- name: "Honeycomb: Start recording" - name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1 uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
@@ -89,11 +91,11 @@ jobs:
apikey: ${{ env.HONEYCOMB_WRITEKEY }} apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }} dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }} job-status: ${{ job.status }}
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }} matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
- name: "Honeycomb: start first step" - name: "Honeycomb: start first step"
run: | run: |
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source - name: Checkout Source
@@ -115,12 +117,12 @@ jobs:
if: ${{ always() }} if: ${{ always() }}
run: | run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment' buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Provision test environment - name: Provision test environment
run: | run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]' buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
echo ::group::=== REQUEST === echo ::group::=== REQUEST ===
cat request.json || true cat request.json || true
echo echo
@@ -142,7 +144,7 @@ jobs:
run: | run: |
echo ::group::honeycomb step echo ::group::honeycomb step
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system' buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV echo STEP_START=$(date +%s) >> $GITHUB_ENV
echo ::endgroup:: echo ::endgroup::
@@ -154,7 +156,7 @@ jobs:
if: ${{ always() }} if: ${{ always() }}
run: | run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests' buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Remove test environment - name: Remove test environment

2
metadata.json
View File

@@ -79,6 +79,6 @@
} }
], ],
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main", "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
"template-ref": "heads/main-0-g44cc7ed", "template-ref": "heads/main-0-g2bf2de6",
"pdk-version": "1.18.1" "pdk-version": "1.18.1"
} }