@@ -249,14 +249,11 @@ jobs:
249
249
container_version : ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.version'] }}
250
250
container_revision : ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
251
251
container_base : ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }}
252
- matrix_supportedSplunk : ${{ steps.matrix.outputs.supportedSplunk }}
253
252
matrix_latestSplunk : ${{ steps.matrix.outputs.latestSplunk }}
254
- matrix_combinedSplunkversion : ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
255
253
matrix_supportedSC4S : ${{ steps.matrix.outputs.supportedSC4S }}
254
+ matrix_combinedSplunkversion : ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
256
255
matrix_supportedModinputFunctionalVendors : ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }}
257
256
matrix_supportedUIVendors : ${{ steps.matrix.outputs.supportedUIVendors }}
258
- python39_splunk : ${{steps.python39_splunk.outputs.splunk}}
259
- python39_sc4s : ${{steps.python39_splunk.outputs.sc4s}}
260
257
permissions :
261
258
contents : write
262
259
packages : read
@@ -293,17 +290,13 @@ jobs:
293
290
- name : matrix
294
291
id : matrix
295
292
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
302
295
id : combined_Splunkmatrix
303
296
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"
307
300
308
301
fossa-scan :
309
302
runs-on : ubuntu-latest
@@ -1028,17 +1021,12 @@ jobs:
1028
1021
- meta
1029
1022
- setup-workflow
1030
1023
runs-on : ubuntu-latest
1031
- continue-on-error : ${{ matrix.python39 }}
1032
1024
strategy :
1033
1025
fail-fast : false
1034
1026
matrix :
1035
- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1027
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1036
1028
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
+
1042
1030
container :
1043
1031
image : ghcr.io/splunk/workflow-engine-base:2.0.12
1044
1032
env :
@@ -1277,17 +1265,12 @@ jobs:
1277
1265
- meta
1278
1266
- setup-workflow
1279
1267
runs-on : ubuntu-latest
1280
- continue-on-error : ${{ matrix.python39 }}
1281
1268
strategy :
1282
1269
fail-fast : false
1283
1270
matrix :
1284
- splunk : ${{ fromJson(needs.meta.outputs.matrix_latestSplunk ) }}
1271
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1285
1272
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
+
1291
1274
container :
1292
1275
image : ghcr.io/splunk/workflow-engine-base:2.0.12
1293
1276
env :
@@ -1504,18 +1487,13 @@ jobs:
1504
1487
- meta
1505
1488
- setup-workflow
1506
1489
runs-on : ubuntu-latest
1507
- continue-on-error : ${{ matrix.python39 }}
1508
1490
strategy :
1509
1491
fail-fast : false
1510
1492
matrix :
1511
- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1493
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1512
1494
browser : [ "chrome" ]
1513
1495
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
+
1519
1497
container :
1520
1498
image : ghcr.io/splunk/workflow-engine-base:2.0.12
1521
1499
env :
@@ -1527,7 +1505,7 @@ jobs:
1527
1505
SPLUNK_VERSION_BASE : ${{ matrix.splunk.version }}${{ secrets.OTHER_TA_REQUIRED_CONFIGS }}
1528
1506
TEST_TYPE : " ui"
1529
1507
TEST_ARGS : " --browser ${{ matrix.browser }}"
1530
- permissions :
1508
+ permissions :
1531
1509
actions : read
1532
1510
deployments : read
1533
1511
contents : read
@@ -1548,7 +1526,7 @@ jobs:
1548
1526
- name : capture start time
1549
1527
id : capture-start-time
1550
1528
run : |
1551
- echo "start_time=$(date +%s)" >> "$GITHUB_OUTPUT"
1529
+ echo "start_time=$(date +%s)" >> "$GITHUB_OUTPUT"
1552
1530
- name : Configure AWS credentials
1553
1531
uses : aws-actions/configure-aws-credentials@v3
1554
1532
with :
@@ -1573,7 +1551,7 @@ jobs:
1573
1551
- name : Splunk instance details
1574
1552
id : splunk-instance-details
1575
1553
if : ${{ needs.setup-workflow.outputs.delay-destroy-ui == 'Yes' }}
1576
- shell : bash
1554
+ shell : bash
1577
1555
run : |
1578
1556
BOLD="\033[1m"
1579
1557
NORMAL="\033[0m"
@@ -1981,17 +1959,11 @@ jobs:
1981
1959
- meta
1982
1960
- setup-workflow
1983
1961
runs-on : ubuntu-latest
1984
- continue-on-error : ${{ matrix.python39 }}
1985
1962
strategy :
1986
1963
fail-fast : false
1987
1964
matrix :
1988
- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
1965
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
1989
1966
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
1995
1967
container :
1996
1968
image : ghcr.io/splunk/workflow-engine-base:2.0.12
1997
1969
env :
@@ -2226,7 +2198,7 @@ jobs:
2226
2198
strategy :
2227
2199
fail-fast : false
2228
2200
matrix :
2229
- splunk : ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk ) }}
2201
+ splunk : ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion ) }}
2230
2202
os : [ "ubuntu:22.04", "centos:7","redhat:8.5" ]
2231
2203
container :
2232
2204
image : ghcr.io/splunk/workflow-engine-base:2.0.12
0 commit comments