@@ -156,7 +156,11 @@ jobs:
156
156
run : |
157
157
set +e
158
158
declare -A EXECUTE_LABELED
159
+ <<<<<<< Updated upstream
159
160
TESTSET=("execute_knowledge" "execute_ui" "execute_modinput_functional" "execute_ucc_modinput_functional" "execute_scripted_inputs" "execute_requirement_test" "execute_upgrade")
161
+ =======
162
+ TESTSET=("execute_knowledge" "execute_ui" "execute_modinput_functional" "execute_ucc_modinput_functional" "execute_scripted_inputs" "execute_requirement_test")
163
+ >>>>>>> Stashed changes
160
164
for test_type in "${TESTSET[@]}"; do
161
165
EXECUTE_LABELED["$test_type"]="false"
162
166
done
@@ -260,6 +264,15 @@ jobs:
260
264
persist-credentials : false
261
265
- id : matrix
262
266
uses : splunk/addonfactory-test-matrix-action@v3.0
267
+ <<<<<<< Updated upstream
268
+ =======
269
+ - name : Reduce Splunk Versions for Scheduled Runs
270
+ if : github.event_name == 'schedule'
271
+ run : |
272
+ echo "Reducing the number of Splunk versions for scheduled runs"
273
+ jq '.supportedSplunk = .latestSplunk' $GITHUB_OUTPUT > $GITHUB_OUTPUT.tmp
274
+ mv $GITHUB_OUTPUT.tmp $GITHUB_OUTPUT
275
+ >>>>>>> Stashed changes
263
276
- name : job summary
264
277
run : |
265
278
splunk_version_list=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq -r '.[].version')
@@ -365,7 +378,10 @@ jobs:
365
378
requirement_test : ${{ steps.testset.outputs.requirement_test }}
366
379
scripted_inputs : ${{ steps.testset.outputs.scripted_inputs }}
367
380
ucc_modinput_functional : ${{ steps.testset.outputs.ucc_modinput_functional }}
381
+ <<<<<<< Updated upstream
368
382
upgrade : ${{ steps.testset.outputs.upgrade }}
383
+ =======
384
+ >>>>>>> Stashed changes
369
385
steps :
370
386
- uses : actions/checkout@v4
371
387
- id : testset
@@ -2559,6 +2575,7 @@ jobs:
2559
2575
with :
2560
2576
name : |
2561
2577
summary-ucc_modinput*
2578
+ <<<<<<< Updated upstream
2562
2579
2563
2580
run-upgrade-tests :
2564
2581
if : ${{ !cancelled() && needs.build.result == 'success' && needs.test-inventory.outputs.upgrade == 'true' }}
@@ -2822,6 +2839,8 @@ jobs:
2822
2839
with :
2823
2840
name : |
2824
2841
summary-upgrade*
2842
+ =======
2843
+ >>>>>>> Stashed changes
2825
2844
2826
2845
run-scripted-input-tests-full-matrix :
2827
2846
if : ${{ !cancelled() && needs.build.result == 'success' && needs.test-inventory.outputs.scripted_inputs == 'true' && needs.setup-workflow.outputs.execute-scripted_inputs-labeled == 'true' }}
0 commit comments