diff --git a/jobs/competitive-test.yml b/jobs/competitive-test.yml index 4f2c6a08f2..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,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: