Skip to content

Commit 86f32ac

Browse files
authored
[3.1] Only set download timeout in CI (#1799)
1 parent 17c6409 commit 86f32ac

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.vsts.pipelines/jobs/ci-linux.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ jobs:
3232
stagingDirectory: $(rootDirectory)/sb/staging
3333
systemLibunwind: ${{ parameters.systemLibunwind }}
3434
tarballName: tarball_$(Build.BuildId)
35+
tarballDownloadArgs: >-
36+
/p:DownloadSourceBuildReferencePackagesTimeoutSeconds=600
37+
/p:DownloadSourceBuiltArtifactsTimeoutSeconds=1500
3538
SOURCE_BUILD_SKIP_SUBMODULE_CHECK: true
3639
# Default type, can be overridden by matrix legs.
3740
type: ${{ coalesce(parameters.type, 'Production') }}
@@ -76,6 +79,7 @@ jobs:
7679
/p:ArchiveDownloadedPackages=$(sb.tarball) \
7780
/p:FailOnPrebuiltBaselineError=$failOnBaselineError \
7881
/p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) \
82+
$(tarballDownloadArgs) \
7983
/p:AzDoPat=$(System.AccessToken)
8084
du -h $(rootDirectory) | sort -h | tail -n 50
8185
displayName: Build source-build

.vsts.pipelines/jobs/ci-local.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ jobs:
1717
pool: ${{ parameters.pool }}
1818
timeoutInMinutes: 240
1919
variables:
20-
args.build: >
20+
args.build: >-
2121
/p:Configuration=$(sb.configuration)
2222
/p:PortableBuild=$(sb.portable)
2323
/p:FailOnPrebuiltBaselineError=$(failOnPrebuiltBaselineError)
2424
/p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix)
2525
/p:AzDoPat=$(System.AccessToken)
26+
$(tarballDownloadArgs)
2627
args.smokeTest: >
2728
--run-smoke-test
2829
/p:Configuration=$(sb.configuration)
@@ -31,6 +32,9 @@ jobs:
3132
artifactName: ${{ format('{0} $(type)', parameters.job) }}
3233
failOnPrebuiltBaselineError: ${{ parameters.failOnPrebuiltBaselineError }}
3334
logsDirectory: $(Build.ArtifactStagingDirectory)/logs
35+
tarballDownloadArgs: >-
36+
/p:SkipDownloadingReferencePackages=true
37+
/p:SkipDownloadingPreviouslySourceBuiltPackages=true
3438
SOURCE_BUILD_SKIP_SUBMODULE_CHECK: true
3539
# Default type, can be overridden by matrix legs.
3640
type: Production

build.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
Inputs="$(MSBuildProjectFullPath)"
157157
Outputs="$(CompletedSemaphorePath)DownloadSourceBuildReferencePackages.complete" >
158158
<PropertyGroup Condition="'$(DownloadSourceBuildReferencePackagesTimeoutSeconds)' == ''">
159-
<DownloadSourceBuildReferencePackagesTimeoutSeconds>600</DownloadSourceBuildReferencePackagesTimeoutSeconds>
159+
<DownloadSourceBuildReferencePackagesTimeoutSeconds>N/A</DownloadSourceBuildReferencePackagesTimeoutSeconds>
160160
</PropertyGroup>
161161

162162
<DownloadFileSB
@@ -173,7 +173,7 @@
173173
Inputs="$(MSBuildProjectFullPath)"
174174
Outputs="$(CompletedSemaphorePath)DownloadSourceBuiltArtifacts.complete" >
175175
<PropertyGroup Condition="'$(DownloadSourceBuiltArtifactsTimeoutSeconds)' == ''">
176-
<DownloadSourceBuiltArtifactsTimeoutSeconds>1500</DownloadSourceBuiltArtifactsTimeoutSeconds>
176+
<DownloadSourceBuiltArtifactsTimeoutSeconds>N/A</DownloadSourceBuiltArtifactsTimeoutSeconds>
177177
</PropertyGroup>
178178

179179
<DownloadFileSB

0 commit comments

Comments
 (0)