Switch to 1ES servicing pools on release/stable (#2668)

diff --git a/diagnostics.yml b/diagnostics.yml
index 0ffba53fdda7aafd7ea377719dd3234218b90f6f..7f614db67f03270e9920507ab681239d47abb2a1 100644 (file)
--- a/diagnostics.yml
+++ b/diagnostics.yml
@@ -348,8 +348,8 @@ stages:
             - Alpine_cross64
             condition: succeeded()
             pool:
-              name: NetCoreInternal-Pool
-              queue: BuildPool.Windows.10.Amd64.VS2019
+              name: NetCore1ESPool-Svc-Internal
+              demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019
             enablePublishUsingPipelines: true
             enableMicrobuild: true
             artifacts:
@@ -401,8 +401,8 @@ stages:
             dependsOn: Sign_Package_Publish
             publishUsingPipelines: true
             pool:
-              name: NetCoreInternal-Pool
-              queue: buildpool.windows.10.amd64.vs2019
+              name: NetCore1ESPool-Svc-Internal
+              demands: ImageOverride -equals Build.windows.10.amd64.vs2019
 
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - template: /eng/common/templates/post-build/post-build.yml

diff --git a/eng/build.yml b/eng/build.yml
index 65fd1d5f162523d10d44956e99d78d6c82254b60..850e8cc9116184f1032cfc42b96d07965e133c6b 100644 (file)
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -33,13 +33,13 @@ jobs:
     pool:
       # Public Linux Build Pool
       ${{ if and(eq(parameters.osGroup, 'Linux'), eq(variables['System.TeamProject'], 'public')) }}:
-        name:  NetCorePublic-Pool
-        queue: BuildPool.Ubuntu.1804.Amd64.Open
+        name:  NetCore1ESPool-Svc-Public
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
 
       # Official Build Linux Pool
       ${{ if and(eq(parameters.osGroup, 'Linux'), ne(variables['System.TeamProject'], 'public')) }}:
-        name: NetCoreInternal-Pool
-        queue: BuildPool.Ubuntu.1804.Amd64
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
 
       # FreeBSD builds only in the internal project
       ${{ if and(eq(parameters.osGroup, 'FreeBSD'), ne(variables['System.TeamProject'], 'public')) }}:
@@ -51,13 +51,13 @@ jobs:
 
       # Official Build Windows Pool
       ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}:
-        name: NetCoreInternal-Pool
-        queue: BuildPool.Windows.10.Amd64.VS2019
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019
 
       # Public Windows Build Pool
       ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}:
-        name: NetCorePublic-Pool
-        queue: BuildPool.Windows.10.Amd64.VS2019.Open
+        name: NetCore1ESPool-Svc-Public
+        demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open
 
     ${{ if and(ne(parameters.dockerImage, ''), ne(parameters.requiresCapPtraceContainer, 'true')) }}:
       container: ${{ parameters.dockerImage }}