Skip to content

Commit 64c705a

Browse files
committed
Sets the default timeout to 150 minutes (for test runs). Official builds are set to 90 minutes. Dotnet-Format runs are also set to 90. Source build is set to 30 minutes.
1 parent dda6610 commit 64c705a

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

.vsts-ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ extends:
106106
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
107107
locBranch: release/8.0.4xx
108108
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
109+
timeoutInMinutes: 90
109110
windowsJobParameterSets:
110111
### OFFICIAL ###
111112
- categoryName: Official
@@ -174,6 +175,7 @@ extends:
174175
publishTaskPrefix: 1ES.
175176
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
176177
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
178+
timeoutInMinutes: 90
177179
linuxJobParameterSets:
178180
### OFFICIAL ###
179181
# Note: These builds are also portable like the Portable category, but that category uses containers, and doesn't publish zips and tarballs.
@@ -275,6 +277,7 @@ extends:
275277
publishTaskPrefix: 1ES.
276278
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
277279
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
280+
timeoutInMinutes: 90
278281
macOSJobParameterSets:
279282
### OFFICIAL ###
280283
- categoryName: Official
@@ -295,6 +298,8 @@ extends:
295298
platform:
296299
name: Managed
297300
container: centosStream9
301+
jobProperties:
302+
timeoutInMinutes: 30
298303

299304
############### DOTNET-FORMAT ###############
300305
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:

.vsts-pr.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ stages:
6565
platform:
6666
name: Managed
6767
container: centosStream9
68+
jobProperties:
69+
timeoutInMinutes: 30
6870

6971
############### DOTNET-FORMAT ###############
7072
- template: /eng/dotnet-format/dotnet-format-integration.yml

eng/dotnet-format/dotnet-format-integration.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ parameters:
5858
_sha: "ecb4b595e3322a18c240f50a763868540f51eaaa"
5959
_useParentSdk: 0
6060

61+
- name: timeoutInMinutes
62+
type: number
63+
default: 90
64+
6165
jobs:
6266
- job: Formatting_Check
6367
displayName: Run Formatting Check
@@ -69,7 +73,7 @@ jobs:
6973
name: $(DncEngInternalBuildPool)
7074
image: 1es-windows-2022
7175
os: windows
72-
timeoutInMinutes: 60
76+
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
7377
steps:
7478
- script: .\restore.cmd
7579
displayName: Restore dependencies
@@ -96,7 +100,7 @@ jobs:
96100
name: $(DncEngInternalBuildPool)
97101
image: 1es-windows-2022
98102
os: windows
99-
timeoutInMinutes: 60
103+
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
100104
steps:
101105
- script: eng\dotnet-format\integration-test.cmd -repo '${{ testArgs._repo }}' -branchName '${{ testArgs._branchName }}' -sha '${{ testArgs._sha }}' -targetSolution '${{ testArgs._targetSolution }}' -useParentSdk ${{ testArgs._useParentSdk }} -testPath '$(Agent.TempDirectory)\temp' -stage 'prepare'
102106
displayName: Prepare ${{ testArgs._repoName }} for formatting

eng/pipelines/templates/jobs/sdk-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ parameters:
1212
publishRetryConfig: false
1313
publishXunitResults: false
1414
enableSbom: true
15+
timeoutInMinutes: 150
1516
### ENV VARS ###
1617
testFullMSBuild: false
1718
runAoTTests: false
@@ -40,7 +41,7 @@ jobs:
4041
container: ${{ parameters.container }}
4142
strategy: ${{ parameters.strategy }}
4243
helixRepo: dotnet/sdk
43-
timeoutInMinutes: 180
44+
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
4445
enableMicrobuild: true
4546
enablePublishBuildAssets: true
4647
enableTelemetry: true

0 commit comments

Comments
 (0)