From be5fd6180c7405ec25aa48d2a9839b932a48925d Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@sangoma.com>
Date: Tue, 5 Mar 2024 08:52:01 -0700
Subject: [PATCH] .github: Pass only single GATETEST_COMMAND to
 AsteriskGateComposite

(cherry picked from commit eed8288d0c026575a833153ac593ae532fdac3f5)
---
 .github/workflows/CherryPickTest.yml |  2 +-
 .github/workflows/NightlyTests.yml   |  2 +-
 .github/workflows/PRSubmitTests.yml  | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/CherryPickTest.yml b/.github/workflows/CherryPickTest.yml
index ffdf71ec9a..59604194d0 100644
--- a/.github/workflows/CherryPickTest.yml
+++ b/.github/workflows/CherryPickTest.yml
@@ -131,7 +131,7 @@ jobs:
           github_token:      ${{secrets.GITHUB_TOKEN}}
           testsuite_repo:    ${{vars.TESTSUITE_REPO}}
           gatetest_group:    ${{matrix.group}}
-          gatetest_commands: ${{vars.GATETEST_COMMANDS}}
+          gatetest_command:  ${{ toJSON(fromJSON(vars.GATETEST_COMMANDS)[matrix.group]) }}
 
   CherryPickGateTests:
     needs: [ IdentifyBranches, CherryPickGateTestMatrix ]
diff --git a/.github/workflows/NightlyTests.yml b/.github/workflows/NightlyTests.yml
index 7eb3e163b7..4d51dcd36c 100644
--- a/.github/workflows/NightlyTests.yml
+++ b/.github/workflows/NightlyTests.yml
@@ -33,7 +33,7 @@ jobs:
           github_token:      ${{secrets.GITHUB_TOKEN}}
           testsuite_repo:    ${{vars.TESTSUITE_REPO}}
           gatetest_group:    ${{matrix.group}}
-          gatetest_commands: ${{vars.GATETEST_COMMANDS}}
+          gatetest_command:  ${{ toJSON(fromJSON(vars.GATETEST_COMMANDS)[matrix.group]) }}
 
   AsteriskNightlyTests:
     if: ${{ always() }}
diff --git a/.github/workflows/PRSubmitTests.yml b/.github/workflows/PRSubmitTests.yml
index bcf6e79b94..1d785475f8 100644
--- a/.github/workflows/PRSubmitTests.yml
+++ b/.github/workflows/PRSubmitTests.yml
@@ -50,18 +50,20 @@ jobs:
           unittest_command:  ${{env.UNITTEST_COMMAND}}
 
   PRSGateTestMatrix:
+    runs-on: ubuntu-latest
     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
     strategy:
       fail-fast: false
       matrix:
         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:
       - id: runtest
+        timeout-minutes: ${{ fromJSON(env.GATETEST_COMMAND).timeout }} 
         name: Run Gate Tests for ${{ matrix.group }}
         uses: asterisk/asterisk-ci-actions/AsteriskGateComposite@main
         with:
@@ -71,7 +73,7 @@ jobs:
           base_branch:       ${{env.BRANCH}}
           testsuite_repo:    ${{env.TESTSUITE_REPO}}
           gatetest_group:    ${{matrix.group}}
-          gatetest_commands: ${{env.GATETEST_COMMANDS}}
+          gatetest_command:  ${{env.GATETEST_COMMAND}}
 
   PRSTestResults:
     if: always()