Skip to content

Commit f14c06e

Browse files
paulmedynskipaulmedynski
authored
Reducing the default test job timeout to 60 minutes, and removing (#3905)
1 parent 1093c70 commit f14c06e

5 files changed

Lines changed: 29 additions & 73 deletions

‎eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,17 @@ parameters:
150150
type: object
151151
default: [net8.0, net9.0]
152152

153+
# The timeout, in minutes, for each test job.
154+
- name: testJobTimeout
155+
displayName: Test job timeout (in minutes)
156+
type: number
157+
default: 60
158+
153159
- name: testSets
154160
displayName: Test Sets
155161
type: object
156162
default: [1, 2, 3]
157163

158-
# The timeout, in minutes, for each test job.
159-
- name: testJobTimeout
160-
displayName: Test job timeout (in minutes)
161-
type: string
162-
default: Default
163-
164164
- name: useManagedSNI
165165
displayName: |
166166
Use Managed/Native SNI on Windows,
@@ -179,17 +179,6 @@ extends:
179179
enableStressTests: ${{ parameters.enableStressTests }}
180180
targetFrameworks: ${{ parameters.targetFrameworks }}
181181
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
182+
testJobTimeout: ${{ parameters.testJobTimeout }}
182183
testSets: ${{ parameters.testSets }}
183-
# Populate the actual test job timeout numeric values if Default was
184-
# specified. We choose different values depending on the build
185-
# configuration.
186-
${{ if eq(parameters.testJobTimeout, 'Default') }}:
187-
# If the build configuration is Debug, we allow a bit of extra time since
188-
# some tests run more slowly, and some tests are Debug only.
189-
${{ if eq(parameters.buildConfiguration, 'Debug') }}:
190-
testJobTimeout: 110
191-
${{ else }}:
192-
testJobTimeout: 90
193-
${{ else }}:
194-
testJobTimeout: ${{ parameters.testJobTimeout }}
195184
useManagedSNI: ${{ parameters.useManagedSNI }}

‎eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,17 @@ parameters:
150150
type: object
151151
default: [net8.0, net9.0]
152152

153+
# The timeout, in minutes, for each test job.
154+
- name: testJobTimeout
155+
displayName: Test job timeout (in minutes)
156+
type: number
157+
default: 60
158+
153159
- name: testSets
154160
displayName: Test Sets
155161
type: object
156162
default: [1, 2, 3]
157163

158-
# The timeout, in minutes, for each test job.
159-
- name: testJobTimeout
160-
displayName: Test job timeout (in minutes)
161-
type: string
162-
default: Default
163-
164164
- name: useManagedSNI
165165
displayName: |
166166
Use Managed/Native SNI on Windows,
@@ -179,17 +179,6 @@ extends:
179179
enableStressTests: ${{ parameters.enableStressTests }}
180180
targetFrameworks: ${{ parameters.targetFrameworks }}
181181
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
182+
testJobTimeout: ${{ parameters.testJobTimeout }}
182183
testSets: ${{ parameters.testSets }}
183-
# Populate the actual test job timeout numeric values if Default was
184-
# specified. We choose different values depending on the build
185-
# configuration.
186-
${{ if eq(parameters.testJobTimeout, 'Default') }}:
187-
# If the build configuration is Debug, we allow a bit of extra time since
188-
# some tests run more slowly, and some tests are Debug only.
189-
${{ if eq(parameters.buildConfiguration, 'Debug') }}:
190-
testJobTimeout: 110
191-
${{ else }}:
192-
testJobTimeout: 90
193-
${{ else }}:
194-
testJobTimeout: ${{ parameters.testJobTimeout }}
195184
useManagedSNI: ${{ parameters.useManagedSNI }}

‎eng/pipelines/dotnet-sqlclient-signing-pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
6767
- name: testJobTimeout
6868
displayName: 'Test job timeout (in minutes)'
6969
type: number
70-
default: 90
70+
default: 60
7171

7272
variables:
7373
- template: /eng/pipelines/libraries/variables.yml@self

‎eng/pipelines/sqlclient-pr-package-ref-pipeline.yml‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ parameters:
105105
type: object
106106
default: [net8.0, net9.0]
107107

108+
# The timeout, in minutes, for each test job.
109+
- name: testJobTimeout
110+
displayName: Test job timeout (in minutes)
111+
type: number
112+
default: 60
113+
108114
- name: testSets
109115
displayName: Test Sets
110116
type: object
111117
default: [1, 2, 3]
112118

113-
# The timeout, in minutes, for each test job.
114-
- name: testJobTimeout
115-
displayName: Test job timeout (in minutes)
116-
type: string
117-
default: Default
118-
119119
- name: useManagedSNI
120120
displayName: |
121121
Use Managed/Native SNI on Windows,
@@ -134,19 +134,8 @@ extends:
134134
enableStressTests: ${{ parameters.enableStressTests }}
135135
targetFrameworks: ${{ parameters.targetFrameworks }}
136136
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
137+
testJobTimeout: ${{ parameters.testJobTimeout }}
137138
testSets: ${{ parameters.testSets }}
138-
# Populate the actual test job timeout numeric values if Default was
139-
# specified. We choose different values depending on the build
140-
# configuration.
141-
${{ if eq(parameters.testJobTimeout, 'Default') }}:
142-
# If the build configuration is Debug, we allow a bit of extra time since
143-
# some tests run more slowly, and some tests are Debug only.
144-
${{ if eq(parameters.buildConfiguration, 'Debug') }}:
145-
testJobTimeout: 110
146-
${{ else }}:
147-
testJobTimeout: 90
148-
${{ else }}:
149-
testJobTimeout: ${{ parameters.testJobTimeout }}
150139
useManagedSNI: ${{ parameters.useManagedSNI }}
151140
# Don't run the AE tests in Debug mode; they rarely succeed.
152141
${{ if eq(parameters.buildConfiguration, 'Debug') }}:

‎eng/pipelines/sqlclient-pr-project-ref-pipeline.yml‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ parameters:
105105
type: object
106106
default: [net8.0, net9.0]
107107

108+
# The timeout, in minutes, for each test job.
109+
- name: testJobTimeout
110+
displayName: Test job timeout (in minutes)
111+
type: number
112+
default: 60
113+
108114
- name: testSets
109115
displayName: Test Sets
110116
type: object
111117
default: [1, 2, 3]
112118

113-
# The timeout, in minutes, for each test job.
114-
- name: testJobTimeout
115-
displayName: Test job timeout (in minutes)
116-
type: string
117-
default: Default
118-
119119
- name: useManagedSNI
120120
displayName: |
121121
Use Managed/Native SNI on Windows,
@@ -134,19 +134,8 @@ extends:
134134
enableStressTests: ${{ parameters.enableStressTests }}
135135
targetFrameworks: ${{ parameters.targetFrameworks }}
136136
targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
137+
testJobTimeout: ${{ parameters.testJobTimeout }}
137138
testSets: ${{ parameters.testSets }}
138-
# Populate the actual test job timeout numeric values if Default was
139-
# specified. We choose different values depending on the build
140-
# configuration.
141-
${{ if eq(parameters.testJobTimeout, 'Default') }}:
142-
# If the build configuration is Debug, we allow a bit of extra time since
143-
# some tests run more slowly, and some tests are Debug only.
144-
${{ if eq(parameters.buildConfiguration, 'Debug') }}:
145-
testJobTimeout: 110
146-
${{ else }}:
147-
testJobTimeout: 90
148-
${{ else }}:
149-
testJobTimeout: ${{ parameters.testJobTimeout }}
150139
useManagedSNI: ${{ parameters.useManagedSNI }}
151140
# Don't run the AE tests in Debug mode; they rarely succeed.
152141
${{ if eq(parameters.buildConfiguration, 'Debug') }}:

0 commit comments

Comments
 (0)