From 8be2b10214f7fd1b9e0176e7ef18d82abd4d5a2d 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jobs/competitive-test.yml b/jobs/competitive-test.yml index 4f2c6a08f2..4c29d57020 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: 60 # default when not specified is 5 minutes - name: retry_attempt_count type: number default: 3 @@ -56,7 +59,8 @@ 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'))) + 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 parameters: From ab7d27c352a9389af950608190ba51eb6e31a160 Mon Sep 17 00:00:00 2001 From: Wolfgang De Salvador Date: Wed, 29 Apr 2026 15:40:23 +0200 Subject: [PATCH 2/2] Fix wrong comment for cancellation timeout --- 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 4c29d57020..9120ef91f4 100644 --- a/jobs/competitive-test.yml +++ b/jobs/competitive-test.yml @@ -38,7 +38,7 @@ parameters: default: 60 # default when not specified is 60 minutes - name: cancellation_timeout_in_minutes type: number - default: 60 # default when not specified is 5 minutes + default: 60 # default when not specified is 60 minutes - name: retry_attempt_count type: number default: 3