From 5dbce3d1971b0cac50276a083193dfff26edd11f Mon Sep 17 00:00:00 2001
From: Wolfgang De Salvador
 <118554802+wolfgang-desalvador@users.noreply.github.com>
Date: Wed, 11 Mar 2026 14:39:11 +0100
Subject: [PATCH 1/2] Update condition logic in competitive-test.yml

---
 jobs/competitive-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/competitive-test.yml b/jobs/competitive-test.yml
index 4f2c6a08f2..70fdc7a6e6 100644
--- a/jobs/competitive-test.yml
+++ b/jobs/competitive-test.yml
@@ -56,7 +56,7 @@ jobs:
     matrix:
       ${{ parameters.matrix }}
   timeoutInMinutes: ${{ parameters.timeout_in_minutes }}
-  condition: or(eq(variables['Build.Reason'], 'Manual'), and(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.SourceBranchName'], 'main')))
+  condition: and(not(canceled()), or(eq(variables['Build.Reason'], 'Manual'), and(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.SourceBranchName'], 'main'))))
   steps:
   - template: /steps/setup-tests.yml
     parameters:

From ce12c8090f7d30fc68af2a338bca3da39ef25d85 Mon Sep 17 00:00:00 2001
From: Wolfgang De Salvador
 <118554802+wolfgang-desalvador@users.noreply.github.com>
Date: Wed, 11 Mar 2026 16:56:22 +0100
Subject: [PATCH 2/2] Add cancellation timeout parameter to competitive test

---
 jobs/competitive-test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jobs/competitive-test.yml b/jobs/competitive-test.yml
index 70fdc7a6e6..00cf710bae 100644
--- a/jobs/competitive-test.yml
+++ b/jobs/competitive-test.yml
@@ -36,6 +36,9 @@ parameters:
 - name: timeout_in_minutes
   type: number
   default: 60 # default when not specified is 60 minutes
+- name: cancellation_timeout_in_minutes
+  type: number
+  default: 5 # default when not specified is 5 minutes
 - name: retry_attempt_count
   type: number
   default: 3
@@ -56,6 +59,7 @@ jobs:
     matrix:
       ${{ parameters.matrix }}
   timeoutInMinutes: ${{ parameters.timeout_in_minutes }}
+  cancelTimeoutInMinutes: ${{ parameters.cancellation_timeout_in_minutes }}
   condition: and(not(canceled()), or(eq(variables['Build.Reason'], 'Manual'), and(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.SourceBranchName'], 'main'))))
   steps:
   - template: /steps/setup-tests.yml