.github: Pass only single GATETEST_COMMAND to AsteriskGateComposite

This commit is contained in:
George Joseph 2024-03-05 08:52:01 -07:00
parent e6c7f1aee0
commit eed8288d0c
3 changed files with 9 additions and 7 deletions

View File

@ -131,7 +131,7 @@ jobs:
github_token: ${{secrets.GITHUB_TOKEN}} github_token: ${{secrets.GITHUB_TOKEN}}
testsuite_repo: ${{vars.TESTSUITE_REPO}} testsuite_repo: ${{vars.TESTSUITE_REPO}}
gatetest_group: ${{matrix.group}} gatetest_group: ${{matrix.group}}
gatetest_commands: ${{vars.GATETEST_COMMANDS}} gatetest_command: ${{ toJSON(fromJSON(vars.GATETEST_COMMANDS)[matrix.group]) }}
CherryPickGateTests: CherryPickGateTests:
needs: [ IdentifyBranches, CherryPickGateTestMatrix ] needs: [ IdentifyBranches, CherryPickGateTestMatrix ]

View File

@ -33,7 +33,7 @@ jobs:
github_token: ${{secrets.GITHUB_TOKEN}} github_token: ${{secrets.GITHUB_TOKEN}}
testsuite_repo: ${{vars.TESTSUITE_REPO}} testsuite_repo: ${{vars.TESTSUITE_REPO}}
gatetest_group: ${{matrix.group}} gatetest_group: ${{matrix.group}}
gatetest_commands: ${{vars.GATETEST_COMMANDS}} gatetest_command: ${{ toJSON(fromJSON(vars.GATETEST_COMMANDS)[matrix.group]) }}
AsteriskNightlyTests: AsteriskNightlyTests:
if: ${{ always() }} if: ${{ always() }}

View File

@ -50,18 +50,20 @@ jobs:
unittest_command: ${{env.UNITTEST_COMMAND}} unittest_command: ${{env.UNITTEST_COMMAND}}
PRSGateTestMatrix: PRSGateTestMatrix:
runs-on: ubuntu-latest
needs: PRSGetControlData needs: PRSGetControlData
env:
TESTSUITE_REPO: "${{ fromJSON(needs.PRSGetControlData.outputs.control_data).TESTSUITE_REPO }}"
GATETEST_COMMANDS: "${{ fromJSON(needs.PRSGetControlData.outputs.control_data).GATETEST_COMMANDS }}"
continue-on-error: false continue-on-error: false
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
group: ${{ fromJSON(fromJSON(needs.PRSGetControlData.outputs.control_data).GATETEST_LIST) }} group: ${{ fromJSON(fromJSON(needs.PRSGetControlData.outputs.control_data).GATETEST_LIST) }}
runs-on: ubuntu-latest env:
TESTSUITE_REPO: "${{ fromJSON(needs.PRSGetControlData.outputs.control_data).TESTSUITE_REPO }}"
GATETEST_COMMANDS: "${{ fromJSON(needs.PRSGetControlData.outputs.control_data).GATETEST_COMMANDS }}"
GATETEST_COMMAND: "${{ toJSON(fromJSON(fromJSON(needs.PRSGetControlData.outputs.control_data).GATETEST_COMMANDS)[matrix.group]) }}"
steps: steps:
- id: runtest - id: runtest
timeout-minutes: ${{ fromJSON(env.GATETEST_COMMAND).timeout }}
name: Run Gate Tests for ${{ matrix.group }} name: Run Gate Tests for ${{ matrix.group }}
uses: asterisk/asterisk-ci-actions/AsteriskGateComposite@main uses: asterisk/asterisk-ci-actions/AsteriskGateComposite@main
with: with:
@ -71,7 +73,7 @@ jobs:
base_branch: ${{env.BRANCH}} base_branch: ${{env.BRANCH}}
testsuite_repo: ${{env.TESTSUITE_REPO}} testsuite_repo: ${{env.TESTSUITE_REPO}}
gatetest_group: ${{matrix.group}} gatetest_group: ${{matrix.group}}
gatetest_commands: ${{env.GATETEST_COMMANDS}} gatetest_command: ${{env.GATETEST_COMMAND}}
PRSTestResults: PRSTestResults:
if: always() if: always()