diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index 320c761b4..abc58eaec 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -23,7 +23,7 @@ on: required: false description: "branch for k8s manifests to run the tests on" type: string - default: "v3.0.2" + default: "v3.0.3" scripted-inputs-os-list: required: false description: "list of OS used for scripted input tests" @@ -182,9 +182,9 @@ jobs: meta: runs-on: ubuntu-latest outputs: + matrix_supportedSplunk: ${{ steps.matrix.outputs.supportedSplunk }} matrix_latestSplunk: ${{ steps.matrix.outputs.latestSplunk }} matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }} - matrix_combinedSplunkversion: ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }} matrix_supportedModinputFunctionalVendors: ${{ steps.matrix.outputs.supportedModinputFunctionalVendors }} matrix_supportedUIVendors: ${{ steps.matrix.outputs.supportedUIVendors }} permissions: @@ -196,13 +196,7 @@ jobs: submodules: false persist-credentials: false - id: matrix - uses: splunk/addonfactory-test-matrix-action@v2.0.2 - - name: Combined Splunk and SC4S Versions - id: combined_Splunkmatrix - run: | - splunk='{"version":"unreleased-python3_9-f8b1a92a256b", "build":"7027496d63d8", "islatest":false, "isoldest":false}' - combinedSplunkversions=$(echo '${{ steps.matrix.outputs.supportedSplunk }}' | jq --argjson A "$splunk" '. + [$A]') - echo "combinedSplunkversions=$(echo "$combinedSplunkversions" | jq -c .)" >> "$GITHUB_OUTPUT" + uses: splunk/addonfactory-test-matrix-action@v2.1 fossa-scan: runs-on: ubuntu-latest @@ -928,7 +922,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} sc4s: ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }} container: @@ -1161,7 +1155,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} sc4s: ${{ fromJson(needs.meta.outputs.matrix_supportedSC4S) }} container: @@ -1372,7 +1366,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} browser: [ "chrome" ] vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedUIVendors) }} marker: ${{ fromJson(inputs.ui_marker) }} @@ -1605,7 +1599,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} modinput-type: [ "modinput_functional" ] vendor-version: ${{ fromJson(needs.meta.outputs.matrix_supportedModinputFunctionalVendors) }} marker: ${{ fromJson(inputs.marker) }} @@ -1836,7 +1830,7 @@ jobs: strategy: fail-fast: false matrix: - splunk: ${{ fromJson(needs.meta.outputs.matrix_combinedSplunkversion) }} + splunk: ${{ fromJson(needs.meta.outputs.matrix_supportedSplunk) }} os: ${{ fromJson(inputs.scripted-inputs-os-list) }} container: image: ghcr.io/splunk/workflow-engine-base:4.1.0