Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to 1ES build pools release/dev17.0 #56186

Merged
merged 11 commits into from
Oct 22, 2021
2 changes: 1 addition & 1 deletion azure-pipelines-integration-lsp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pr:
jobs:
- job: VS_Integration_LSP
pool:
name: NetCorePublic-Pool
name: NetCore1ESPool-Svc-Public
queue: $(queueName)
jonfortescue marked this conversation as resolved.
Show resolved Hide resolved
timeoutInMinutes: 135

Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ stages:
displayName: Official Build
timeoutInMinutes: 360
pool:
name: NetCoreInternal-Pool
queue: BuildPool.Server.Amd64.VS2019
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019

steps:
- powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines-richnav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ pr: none
jobs:
- job: RichCodeNav_Indexing
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.Open
variables:
EnableRichCodeNavigation: true
timeoutInMinutes: 200
Expand Down
20 changes: 10 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
jobName: Build_Windows_Debug
testArtifactName: Transport_Artifacts_Windows_Debug
configuration: Debug
queueName: BuildPool.Windows.10.Amd64.Open
queueName: Build.Windows.10.Amd64.Open

- template: eng/pipelines/build-windows-job.yml
parameters:
jobName: Build_Windows_Release
testArtifactName: Transport_Artifacts_Windows_Release
configuration: Release
queueName: BuildPool.Windows.10.Amd64.Open
queueName: Build.Windows.10.Amd64.Open

- template: eng/pipelines/test-windows-job.yml
parameters:
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
jobName: Build_Unix_Debug
testArtifactName: Transport_Artifacts_Unix_Debug
configuration: Debug
queueName: BuildPool.Ubuntu.1804.Amd64.Open
queueName: Build.Ubuntu.1804.Amd64.Open

- template: eng/pipelines/test-unix-job.yml
parameters:
Expand All @@ -136,7 +136,7 @@ jobs:
testArtifactName: Transport_Artifacts_Unix_Debug
configuration: Debug
testArguments: --testCoreClr
queueName: 'BuildPool.Ubuntu.1804.amd64.Open'
queueName: 'Build.Ubuntu.1804.amd64.Open'

- template: eng/pipelines/test-unix-job.yml
parameters:
Expand All @@ -153,8 +153,8 @@ jobs:

- job: Correctness_Determinism
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open
timeoutInMinutes: 90
steps:
- template: eng/pipelines/checkout-windows-task.yml
Expand All @@ -169,8 +169,8 @@ jobs:

- job: Correctness_Build
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.VS2019.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open
timeoutInMinutes: 90
steps:
- template: eng/pipelines/checkout-windows-task.yml
Expand Down Expand Up @@ -201,8 +201,8 @@ jobs:

- job: Correctness_Rebuild
pool:
name: NetCorePublic-Pool
queue: BuildPool.Windows.10.Amd64.Open
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.Open
timeoutInMinutes: 90
steps:
- template: eng/pipelines/checkout-windows-task.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/build-unix-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
- job: ${{ parameters.jobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCorePublic-Pool
queue: ${{ parameters.queueName }}
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
vmImage: ${{ parameters.vmImageName }}
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/build-windows-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
- job: ${{ parameters.jobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCorePublic-Pool
queue: ${{ parameters.queueName }}
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
vmImage: ${{ parameters.vmImageName }}
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/test-unix-job-single-machine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
dependsOn: ${{ parameters.buildJobName }}
pool:
${{ if ne(parameters.queueName, '') }}:
name: NetCorePublic-Pool
queue: ${{ parameters.queueName }}
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals ${{ parameters.queueName }}

${{ if ne(parameters.vmImageName, '') }}:
vmImage: ${{ parameters.vmImageName }}
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/test-windows-job-single-machine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ parameters:
default: ''
- name: queueName
type: string
default: 'BuildPool.Windows.10.Amd64.Open'
default: 'Build.Windows.10.Amd64.Open'

jobs:
- job: ${{ parameters.jobName }}
dependsOn: ${{ parameters.buildJobName }}
pool:
name: NetCorePublic-Pool
queue: ${{ parameters.queueName }}
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals ${{ parameters.queueName }}
timeoutInMinutes: 120
variables:
DOTNET_ROLL_FORWARD: LatestMajor
Expand Down