Skip to content

Commit c789ba5

Browse files
author
github-actions
committed
syncing from "puppetlabs/support_workflows"
1 parent 9bbc7ff commit c789ba5

File tree

4 files changed

+36
-4
lines changed

4 files changed

+36
-4
lines changed

.github/workflows/pe_latest_testing.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,30 @@ jobs:
5050
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5151
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5252
echo STEP_START=$(date +%s) >> $GITHUB_ENV
53+
54+
# Store the result of the curl call in $forge_response
55+
- name: Curl Forge for PE versions
56+
id: curl_forge
57+
run: |
58+
echo "::set-output name=forge_response::$(curl https://forge.puppet.com/private/versions/pe)"
59+
60+
- name: Set latest release
61+
id: latest_release
62+
run: |
63+
out=$(jq -c '[.[] | select(.lts == false)][0].latest | {"collection": [.]}' <<<'${{ steps.curl_forge.outputs.forge_response }}')
64+
echo "::set-output name=latest::$out"
65+
5366
- name: Setup Acceptance Test Matrix
5467
id: get-matrix
5568
run: |
56-
echo "::set-output name=matrix::$(cat spec/fixtures/matrix/latest.json)"
69+
out=$(jq -c '. + ($matrix | .[])' --slurpfile matrix spec/fixtures/matrix/latest.json <<<'${{ steps.latest_release.outputs.latest }}')
70+
echo "::set-output name=matrix::$out"
71+
5772
- name: "Honeycomb: Record Setup Test Matrix time"
5873
if: ${{ always() }}
5974
run: |
6075
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
76+
6177
Acceptance:
6278
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
6379
needs:

.github/workflows/pe_lts_testing.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,30 @@ jobs:
5050
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5151
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5252
echo STEP_START=$(date +%s) >> $GITHUB_ENV
53+
54+
# Store the result of the curl call in $forge_response
55+
- name: Curl Forge for PE versions
56+
id: curl_forge
57+
run: |
58+
echo "::set-output name=forge_response::$(curl https://forge.puppet.com/private/versions/pe)"
59+
60+
- name: Set latest release
61+
id: latest_release
62+
run: |
63+
out=$(jq -c '[.[] | select(.lts == true)][0].latest | {"collection": [.]}' <<<'${{ steps.curl_forge.outputs.forge_response }}')
64+
echo "::set-output name=latest::$out"
65+
5366
- name: Setup Acceptance Test Matrix
5467
id: get-matrix
5568
run: |
56-
echo "::set-output name=matrix::$(cat spec/fixtures/matrix/lts.json)"
69+
out=$(jq -c '. + ($matrix | .[])' --slurpfile matrix spec/fixtures/matrix/lts.json <<<'${{ steps.latest_release.outputs.latest }}')
70+
echo "::set-output name=matrix::$out"
71+
5772
- name: "Honeycomb: Record Setup Test Matrix time"
5873
if: ${{ always() }}
5974
run: |
6075
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
76+
6177
Acceptance:
6278
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
6379
needs:

spec/fixtures/matrix/latest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"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"},{"label":"Sles-12","provider":"provision::provision_service","image":"sles-12"}],"collection":["2021.3.0"]}
1+
{"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"},{"label":"Sles-12","provider":"provision::provision_service","image":"sles-12"}]}

spec/fixtures/matrix/lts.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"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"},{"label":"Sles-12","provider":"provision::provision_service","image":"sles-12"}],"collection":["2019.8.8"]}
1+
{"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"},{"label":"Sles-12","provider":"provision::provision_service","image":"sles-12"}]}

0 commit comments

Comments
 (0)