Skip to content

Commit 52f3f79

Browse files
natemcmasterjkotalik
authored andcommitted
Use VS2019 Enterprise queues for testing (#9571)
1 parent 9212f4a commit 52f3f79

File tree

3 files changed

+29
-48
lines changed

3 files changed

+29
-48
lines changed

.azure/pipelines/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,10 @@ jobs:
295295
jobName: Windows_Test
296296
jobDisplayName: "Test: Windows Server 2016 x64"
297297
agentOs: Windows
298+
isTestingJob: true
298299
buildScript: ./eng/scripts/cibuild.cmd
299300
buildArgs: -test "/p:SkipIISBackwardsCompatibilityTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISForwardsCompatibilityTests=true /p:RunTemplateTests=false"
300301
beforeBuild:
301-
- powershell: ./eng/scripts/InstallSqlServerLocalDB.ps1
302-
displayName: Install SQL Server 2016 Express LocalDB
303302
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
304303
displayName: Setup IISExpress test certificates and schema
305304
afterBuild:
@@ -317,6 +316,7 @@ jobs:
317316
jobName: Windows_Templates_Test
318317
jobDisplayName: "Test: Templates - Windows Server 2016 x64"
319318
agentOs: Windows
319+
isTestingJob: true
320320
buildScript: ./src/ProjectTemplates/build.cmd
321321
buildArgs: -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
322322
beforeBuild:
@@ -333,6 +333,7 @@ jobs:
333333
jobName: MacOs_Test
334334
jobDisplayName: "Test: macOS 10.13"
335335
agentOs: macOs
336+
isTestingJob: true
336337
buildScript: ./eng/scripts/cibuild.sh
337338
buildArgs: --test
338339
beforeBuild:
@@ -353,6 +354,7 @@ jobs:
353354
jobName: Linux_Test
354355
jobDisplayName: "Test: Ubuntu 16.04 x64"
355356
agentOs: Linux
357+
isTestingJob: true
356358
buildScript: ./eng/scripts/cibuild.sh
357359
buildArgs: --test
358360
beforeBuild:

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

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,22 @@ jobs:
9494
${{ if ne(parameters.poolName, '') }}:
9595
name: ${{ parameters.poolName }}
9696
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
97-
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
97+
${{ if eq(variables['System.TeamProject'], 'public') }}:
9898
name: NetCorePublic-Int-Pool
99-
queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open
100-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
99+
${{ if ne(parameters.isTestingJob, true) }}:
100+
# Visual Studio Build Tools
101+
queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open
102+
${{ if eq(parameters.isTestingJob, true) }}:
103+
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
104+
queue: BuildPool.Windows.10.Amd64.VS2019.Open
105+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
101106
name: NetCoreInternal-Int-Pool
102-
queue: BuildPool.Windows.10.Amd64.VS2019.BT
107+
${{ if ne(parameters.isTestingJob, true) }}:
108+
# Visual Studio Build Tools
109+
queue: BuildPool.Windows.10.Amd64.VS2019.BT
110+
${{ if eq(parameters.isTestingJob, true) }}:
111+
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
112+
queue: BuildPool.Windows.10.Amd64.VS2019
103113
variables:
104114
AgentOsName: ${{ parameters.agentOs }}
105115
ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
@@ -112,10 +122,13 @@ jobs:
112122
TeamName: AspNetCore
113123
${{ if eq(parameters.agentOs, 'Windows') }}:
114124
JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
115-
${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal')) }}:
125+
${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
116126
_SignType: ''
117-
${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal')) }}:
118-
_SignType: real
127+
${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:
128+
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
129+
_SignType: real
130+
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
131+
_SignType: test
119132
${{ insert }}: ${{ parameters.variables }}
120133
steps:
121134
- checkout: self
@@ -131,11 +144,11 @@ jobs:
131144
Write-Host "##vso[task.prependpath]$env:JAVA_HOME\bin"
132145
133146
displayName: Install JDK 11
134-
- powershell: |
135-
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(BuildDirectory)\obj\selenium\"
136-
./eng/scripts/InstallGoogleChrome.ps1
137-
138-
displayName: Install Chrome
147+
- ${{ if eq(parameters.isTestingJob, true) }}:
148+
- powershell: |
149+
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(BuildDirectory)\obj\selenium\"
150+
./eng/scripts/InstallGoogleChrome.ps1
151+
displayName: Install Chrome
139152
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
140153
- task: MicroBuildSigningPlugin@1
141154
displayName: Install MicroBuild Signing plugin

eng/scripts/InstallSqlServerLocalDB.ps1

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)