From eb6705fc3b58aa5b17e90049458dac50c94a1511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Ros?= <sebastienros@gmail.com>
Date: Thu, 16 Sep 2021 13:48:34 -0700
Subject: [PATCH] Revert "Use new Hosted build pools (#36110)" (#36613)
This reverts commit f4cc3c003222658b92753af55fbd66dbfa59251b.
---
.azure/pipelines/jobs/default-build.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index cba5884eca1..2aaf34c9206 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -104,24 +104,24 @@ jobs:
vmImage: ubuntu-18.04
${{ if eq(parameters.useHostedUbuntu, false) }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCore1ESPool-Svc-Public
- demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+ name: NetCorePublic-Pool
+ queue: BuildPool.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
- name: NetCore1ESPool-Svc-Internal
- demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+ name: NetCoreInternal-Pool
+ queue: BuildPool.Ubuntu.1804.Amd64
${{ if eq(parameters.agentOs, 'Windows') }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: NetCore1ESPool-Svc-Public
+ name: NetCorePublic-Pool
${{ if ne(parameters.isTestingJob, true) }}:
# Visual Studio Build Tools
- demands: ImageOverride -equals Build.Server.Amd64.VS2019.BT.Open
+ queue: BuildPool.Server.Amd64.VS2019.BT.Open
${{ if eq(parameters.isTestingJob, true) }}:
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
- demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
+ queue: BuildPool.Server.Amd64.VS2019.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
- name: NetCore1ESPool-Svc-Internal
+ name: NetCoreInternal-Pool
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
- demands: ImageOverride -equals Build.Server.Amd64.VS2019
+ queue: BuildPool.Server.Amd64.VS2019
${{ if ne(parameters.container, '') }}:
container: ${{ parameters.container }}
variables:
--
GitLab