@@ -249,14 +249,11 @@ jobs:
249249 container_version : ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.version'] }}
250250 container_revision : ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
251251 container_base : ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }}
252- matrix_supportedSplunk : ${{ steps.matrix.outputs.supportedSplunk }}
253252 matrix_latestSplunk : ${{ steps.matrix.outputs.latestSplunk }}
254- matrix_combinedSplunkversion : ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
255253 matrix_supportedSC4S : ${{ steps.matrix.outputs.supportedSC4S }}
254+ matrix_combinedSplunkversion : ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
256255 matrix_supportedModinputFunctionalVendors : ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }}
257256 matrix_supportedUIVendors : ${{ steps.matrix.outputs.supportedUIVendors }}
258- python39_splunk : ${{steps.python39_splunk.outputs.splunk}}
259- python39_sc4s : ${{steps.python39_splunk.outputs.sc4s}}
260257 permissions :
261258 contents : write
262259 packages : read
@@ -293,17 +290,13 @@ jobs:
293290 - name : matrix
294291 id : matrix
295292 uses : splunk/addonfactory-test-matrix-action@v1.13
296- - name : python39_Splunk
297- id : python39_splunk
298- run : |
299- echo "splunk={\"version\":\"unreleased-python3_9-7027496d63d8\", \"build\":\"7027496d63d8\", \"islatest\":false, \"isoldest\":false}" >> "$GITHUB_OUTPUT"
300- echo "sc4s={\"version\":\"2.49.5\", \"docker_registry\":\"ghcr.io/splunk/splunk-connect-for-syslog/container2\"}" >> "$GITHUB_OUTPUT"
301- - name : combined_Splunkmatrix
293+
294+ - name : Combined Splunk and SC4S Versions
302295 id : combined_Splunkmatrix
303296 run : |
304- combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A '${{steps.python39_splunk.outputs.splunk}}' '. + [$A]')
305- echo " combinedSplunkversions=$(echo "$combinedSplunkversions" | jq -c .)" >> "$GITHUB_OUTPUT"
306-
297+ splunk='{"version":"unreleased-python3_9-7027496d63d8", "build":"7027496d63d8", "islatest":false, "isoldest":false}'
298+ combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A "$splunk" '. + [$A]')
299+ echo "combinedSplunkversions=$(echo "$combinedSplunkversions" | jq -c .)" >> "$GITHUB_OUTPUT"
307300
308301 fossa-scan :
309302 runs-on : ubuntu-latest
@@ -1028,17 +1021,12 @@ jobs:
10281021 - meta
10291022 - setup-workflow
10301023 runs-on : ubuntu-latest
1031- continue-on-error : ${{ matrix.python39 }}
10321024 strategy :
10331025 fail-fast : false
10341026 matrix :
1035- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1027+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
10361028 sc4s : ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }}
1037- python39 : [false]
1038- include :
1039- - splunk : ${{ fromJson(needs.meta.outputs.python39_splunk) }}
1040- sc4s : ${{ fromJson(needs.meta.outputs.python39_sc4s) }}
1041- python39 : true
1029+
10421030 container :
10431031 image : ghcr.io/splunk/workflow-engine-base:2.0.12
10441032 env :
@@ -1277,17 +1265,12 @@ jobs:
12771265 - meta
12781266 - setup-workflow
12791267 runs-on : ubuntu-latest
1280- continue-on-error : ${{ matrix.python39 }}
12811268 strategy :
12821269 fail-fast : false
12831270 matrix :
1284- splunk : ${{ fromJson(needs.meta.outputs.matrix_latestSplunk ) }}
1271+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
12851272 sc4s : ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }}
1286- python39 : [false]
1287- include :
1288- - splunk : ${{ fromJson(needs.meta.outputs.python39_splunk) }}
1289- sc4s : ${{ fromJson(needs.meta.outputs.python39_sc4s) }}
1290- python39 : true
1273+
12911274 container :
12921275 image : ghcr.io/splunk/workflow-engine-base:2.0.12
12931276 env :
@@ -1504,18 +1487,13 @@ jobs:
15041487 - meta
15051488 - setup-workflow
15061489 runs-on : ubuntu-latest
1507- continue-on-error : ${{ matrix.python39 }}
15081490 strategy :
15091491 fail-fast : false
15101492 matrix :
1511- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1493+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
15121494 browser : [ "chrome" ]
15131495 vendor-version : ${{ fromJson(needs.meta.outputs.matrix_supportedUIVendors) }}
1514- python39 : [false]
1515- include :
1516- - splunk : ${{ fromJson(needs.meta.outputs.python39_splunk) }}
1517- browser : " chrome"
1518- python39 : true
1496+
15191497 container :
15201498 image : ghcr.io/splunk/workflow-engine-base:2.0.12
15211499 env :
@@ -1527,7 +1505,7 @@ jobs:
15271505 SPLUNK_VERSION_BASE : ${{ matrix.splunk.version }}${{ secrets.OTHER_TA_REQUIRED_CONFIGS }}
15281506 TEST_TYPE : " ui"
15291507 TEST_ARGS : " --browser ${{ matrix.browser }}"
1530- permissions :
1508+ permissions :
15311509 actions : read
15321510 deployments : read
15331511 contents : read
@@ -1548,7 +1526,7 @@ jobs:
15481526 - name : capture start time
15491527 id : capture-start-time
15501528 run : |
1551- echo "start_time=$(date +%s)" >> "$GITHUB_OUTPUT"
1529+ echo "start_time=$(date +%s)" >> "$GITHUB_OUTPUT"
15521530 - name : Configure AWS credentials
15531531 uses : aws-actions/configure-aws-credentials@v3
15541532 with :
@@ -1573,7 +1551,7 @@ jobs:
15731551 - name : Splunk instance details
15741552 id : splunk-instance-details
15751553 if : ${{ needs.setup-workflow.outputs.delay-destroy-ui == 'Yes' }}
1576- shell : bash
1554+ shell : bash
15771555 run : |
15781556 BOLD="\033[1m"
15791557 NORMAL="\033[0m"
@@ -1981,17 +1959,11 @@ jobs:
19811959 - meta
19821960 - setup-workflow
19831961 runs-on : ubuntu-latest
1984- continue-on-error : ${{ matrix.python39 }}
19851962 strategy :
19861963 fail-fast : false
19871964 matrix :
1988- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1965+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
19891966 os : [ "ubuntu:14.04", "ubuntu:16.04","ubuntu:18.04","ubuntu:22.04", "centos:7", "redhat:8.0", "redhat:8.2", "redhat:8.3", "redhat:8.4", "redhat:8.5" ]
1990- python39 : [false]
1991- include :
1992- - splunk : ${{ fromJson(needs.meta.outputs.python39_splunk) }}
1993- os : " ubuntu:22.04"
1994- python39 : true
19951967 container :
19961968 image : ghcr.io/splunk/workflow-engine-base:2.0.12
19971969 env :
@@ -2226,7 +2198,7 @@ jobs:
22262198 strategy :
22272199 fail-fast : false
22282200 matrix :
2229- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
2201+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
22302202 os : [ "ubuntu:22.04", "centos:7","redhat:8.5" ]
22312203 container :
22322204 image : ghcr.io/splunk/workflow-engine-base:2.0.12
0 commit comments