7
7
name : " Setup Test Matrix"
8
8
runs-on : ubuntu-20.04
9
9
outputs :
10
- matrix : ${{ steps.build -matrix.outputs.matrix }}
10
+ matrix : ${{ steps.set -matrix.outputs.acc_matrix }}
11
11
12
12
steps :
13
13
- name : Checkout Source
@@ -31,30 +31,34 @@ jobs:
31
31
id : curl_forge
32
32
run : |
33
33
echo "forge_response=$(curl https://forge.puppet.com/private/versions/pe)" >> $GITHUB_OUTPUT
34
- - name : Set latest release
34
+ - name : Set PE latest release
35
35
id : latest_release
36
36
run : |
37
- out=$(jq -c '[.[] | select(.lts == false)][0].latest | {"collection ": [.]}' <<<'${{ steps.curl_forge.outputs.forge_response }}')
37
+ out=$(jq -c '[.[] | select(.lts == false)][0].latest | {"pe_version ": [.]}' <<<'${{ steps.curl_forge.outputs.forge_response }}')
38
38
echo "latest=$out" >> $GITHUB_OUTPUT
39
- - name : Setup Spec Test Matrix
40
- id : set -matrix
39
+ - name : Build Test Matrix
40
+ id : build -matrix
41
41
run : |
42
- echo "matrix={\"platforms\":[\"rhel-8\",\"rhel-9\",\"sles-15\",\"ubuntu-2204-lts\"]}" >> $GITHUB_OUTPUT
42
+ bundle exec matrix_from_metadata_v3 \
43
+ --provision-exclude docker \
44
+ --arch-exclude arm \
45
+ --platform-exclude debian \
46
+ --platform-exclude sles
47
+ --platform-exclude ubuntu
43
48
- name : Setup Acceptance Test Matrix
44
- id : build -matrix
49
+ id : set -matrix
45
50
run : |
46
- out=$(echo '${{ steps.set -matrix.outputs.matrix }}' | jq -c --argjson latest '${{ steps.latest_release.outputs.latest }}' '.collection + = $latest.collection ')
47
- echo "matrix =$out" >> $GITHUB_OUTPUT
51
+ out=$(echo '${{ steps.build -matrix.outputs.matrix }}' | jq -c --argjson latest '${{ steps.latest_release.outputs.latest }}' '.collection = $latest.pe_version ')
52
+ echo "acc_matrix =$out" >> $GITHUB_OUTPUT
48
53
Integration :
49
- name : " ${{matrix.platforms}}, ${{matrix.collection}}"
54
+ name : " ${{matrix.platforms.label }}, ${{matrix.collection}}"
50
55
needs :
51
56
- setup_matrix
52
- if : ${{ needs.setup_matrix.outputs.matrix != '{}' }}
53
57
54
58
runs-on : ubuntu-20.04
55
59
strategy :
56
60
fail-fast : false
57
- matrix : ${{fromJson(needs.setup_matrix.outputs.matrix)}}
61
+ matrix : ${{ fromJson(needs.setup_matrix.outputs.matrix) }}
58
62
59
63
steps :
60
64
- name : Checkout Source
78
82
echo ::endgroup::
79
83
- name : Provision test environment
80
84
run : |
81
- bundle exec bolt --modulepath spec/fixtures/modules plan run splunk_hec::acceptance::provision_machines using='provision_service' image='${{ matrix.platforms }}'
85
+ bundle exec bolt --modulepath spec/fixtures/modules plan run splunk_hec::acceptance::provision_machines using='provision_service' image='${{ matrix.platforms.image }}'
82
86
echo ::group::=== REQUEST ===
83
87
cat request.json || true
84
88
echo
0 commit comments