Skip to content

Commit 7e7c9b4

Browse files
author
N. Taylor Mullen
committed
Use different Ubuntu pools for Ubuntu tests to avoid disk space issues.
- Updated the `default-build.yml` to have a new parameter specific to Ubuntu listed `useHostedUbuntu`. If we feel the need to expand the parameters usage outside of the Ubuntu configuration we can always rename to `useHosted`. Also didn't want to touch the `isTestingJob` because I wasn't sure of hte implications. - Updated the Ubuntu test job to turn off hosted pools. Fixes https://github.com/dotnet/aspnetcore-internal/issues/3574
1 parent 8109690 commit 7e7c9b4

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.azure/pipelines/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ stages:
527527
jobDisplayName: "Test: Windows Server 2016 x64"
528528
agentOs: Windows
529529
isTestingJob: true
530+
useHostedUbuntu: false
530531
buildArgs: -all -pack -test -BuildNative "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
531532
beforeBuild:
532533
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"

.azure/pipelines/jobs/default-build.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
enableTelemetry: true
8484
helixRepo: dotnet/aspnetcore
8585
helixType: build.product/
86+
useHostedUbuntu: true
8687
workspace:
8788
clean: all
8889
# Map friendly OS names to the right queue
@@ -91,7 +92,15 @@ jobs:
9192
${{ if eq(parameters.agentOs, 'macOS') }}:
9293
vmImage: macOS-10.14
9394
${{ if eq(parameters.agentOs, 'Linux') }}:
94-
vmImage: ubuntu-16.04
95+
${{ if eq(parameters.useHostedUbuntu, true) }}:
96+
vmImage: ubuntu-16.04
97+
${{ if eq(parameters.useHostedUbuntu, false) }}:
98+
${{ if eq(variables['System.TeamProject'], 'public') }}:
99+
name: NetCorePublic-Pool
100+
queue: buildpool.ubuntu.1604.amd64.open
101+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
102+
name: NetCoreInternal-Pool
103+
queue: buildpool.ubuntu.1604.amd64
95104
${{ if eq(parameters.agentOs, 'Windows') }}:
96105
${{ if eq(variables['System.TeamProject'], 'public') }}:
97106
name: NetCorePublic-Pool

0 commit comments

Comments
 (0)