diff --git a/azure-pipelines-integration-lsp.yml b/azure-pipelines-integration-lsp.yml index 92b3e4151ef29..0270799d3b21d 100644 --- a/azure-pipelines-integration-lsp.yml +++ b/azure-pipelines-integration-lsp.yml @@ -21,8 +21,8 @@ pr: jobs: - job: VS_Integration_LSP pool: - name: NetCorePublic-Pool - queue: $(queueName) + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open timeoutInMinutes: 135 steps: diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml index 9be3f5de6e7d2..251f8641c4feb 100644 --- a/azure-pipelines-integration.yml +++ b/azure-pipelines-integration.yml @@ -17,8 +17,8 @@ pr: jobs: - job: VS_Integration pool: - name: $(poolName) - queue: $(queueName) + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open strategy: maxParallel: 4 matrix: diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 20ecbfa939547..6572395e03a4c 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -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))" diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml index d327060f6c65e..4bf52240ca699 100644 --- a/azure-pipelines-richnav.yml +++ b/azure-pipelines-richnav.yml @@ -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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 055b0de9ec195..d4db92b9a244b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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: @@ -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: @@ -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: @@ -153,8 +153,8 @@ jobs: - job: Correctness_Determinism pool: - name: NetCorePublic-Pool - queue: BuildPool.Windows.Amd64.VS2022.Pre.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open timeoutInMinutes: 90 steps: - template: eng/pipelines/checkout-windows-task.yml @@ -169,8 +169,8 @@ jobs: - job: Correctness_Build pool: - name: NetCorePublic-Pool - queue: BuildPool.Windows.Amd64.VS2022.Pre.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open timeoutInMinutes: 90 steps: - template: eng/pipelines/checkout-windows-task.yml @@ -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 diff --git a/eng/pipelines/build-unix-job.yml b/eng/pipelines/build-unix-job.yml index a78aa0d14874a..f60f07aab725b 100644 --- a/eng/pipelines/build-unix-job.yml +++ b/eng/pipelines/build-unix-job.yml @@ -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 }} diff --git a/eng/pipelines/build-windows-job.yml b/eng/pipelines/build-windows-job.yml index f23bfa359dcc8..f9e0c7df9ed77 100644 --- a/eng/pipelines/build-windows-job.yml +++ b/eng/pipelines/build-windows-job.yml @@ -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 }} diff --git a/eng/pipelines/test-unix-job-single-machine.yml b/eng/pipelines/test-unix-job-single-machine.yml index 703d92c13c492..27ff0ff5f47a4 100644 --- a/eng/pipelines/test-unix-job-single-machine.yml +++ b/eng/pipelines/test-unix-job-single-machine.yml @@ -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 }} diff --git a/eng/pipelines/test-windows-job-single-machine.yml b/eng/pipelines/test-windows-job-single-machine.yml index 250db3a9c4424..d59938258e7b8 100644 --- a/eng/pipelines/test-windows-job-single-machine.yml +++ b/eng/pipelines/test-windows-job-single-machine.yml @@ -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