From 3e093155b1361875035dbcfead06252dd20b7a18 Mon Sep 17 00:00:00 2001
From: Matt Cooley <matt@mattcooley.net>
Date: Tue, 19 Feb 2019 07:40:15 -0800
Subject: [PATCH] Move build jobs to hosted pools (#22)

* Move build jobs to the Hosted VS2017 pool instead of our internal pool
* Move the prepare-release-internalonly job from a team-specific pool to a shared pool with more capacity
* Remove symbol publishing from PR/CI builds since it's not necessary; do it only in release builds
---
 build/pipelines/templates/build-app-internal.yaml | 15 ++++++++++-----
 build/pipelines/templates/build-app-public.yaml   |  6 +-----
 .../templates/build-single-architecture.yaml      |  9 ---------
 build/pipelines/templates/package-appxbundle.yaml |  6 +-----
 .../templates/prepare-release-internalonly.yaml   |  4 +---
 5 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/build/pipelines/templates/build-app-internal.yaml b/build/pipelines/templates/build-app-internal.yaml
index a84c0bcf..8a75dcec 100644
--- a/build/pipelines/templates/build-app-internal.yaml
+++ b/build/pipelines/templates/build-app-internal.yaml
@@ -12,11 +12,7 @@ jobs:
   displayName: Build ${{ parameters.platform }}
   condition: ${{ parameters.condition }}
   pool:
-    name: Package ES Custom Demands Lab A
-    demands:
-    - msbuild
-    - visualstudio
-    - ClientAlias -equals PKGESUTILAPPS
+    vmImage: vs2017-win2016
   variables:
     BuildConfiguration: Release
     BuildPlatform: ${{ parameters.platform }}
@@ -39,6 +35,15 @@ jobs:
     parameters:
       extraMsBuildArgs: '/p:IsStoreBuild=true'
 
+  - task: PublishSymbols@2
+    displayName: Publish symbols
+    inputs:
+      symbolsFolder: $(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)
+      searchPattern: '**/*.pdb'
+      symbolServerType: teamServices
+      treatNotIndexedAsWarning: true
+      symbolsArtifactName: $(System.teamProject)/$(Build.BuildNumber)_$(BuildPlatform)$(BuildConfiguration)
+
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
     displayName: Run BinSkim
     inputs:
diff --git a/build/pipelines/templates/build-app-public.yaml b/build/pipelines/templates/build-app-public.yaml
index 87f862f1..78c033ed 100644
--- a/build/pipelines/templates/build-app-public.yaml
+++ b/build/pipelines/templates/build-app-public.yaml
@@ -10,11 +10,7 @@ jobs:
   displayName: Build ${{ parameters.platform }}
   condition: ${{ parameters.condition }}
   pool:
-    name: Package ES Custom Demands Lab A
-    demands:
-    - msbuild
-    - visualstudio
-    - ClientAlias -equals PKGESUTILAPPS
+    vmImage: vs2017-win2016
   variables:
     BuildConfiguration: Release
     BuildPlatform: ${{ parameters.platform }}
diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml
index feb9896f..92e06f7b 100644
--- a/build/pipelines/templates/build-single-architecture.yaml
+++ b/build/pipelines/templates/build-single-architecture.yaml
@@ -42,12 +42,3 @@ steps:
       artifactName: drop
       pathToPublish: $(Build.BinariesDirectory)
       parallel: true
-
-  - task: PublishSymbols@2
-    displayName: Publish symbols
-    inputs:
-      symbolsFolder: $(Build.BinariesDirectory)\$(BuildConfiguration)\$(BuildPlatform)
-      searchPattern: '**/*.pdb'
-      symbolServerType: teamServices
-      treatNotIndexedAsWarning: true
-      symbolsArtifactName: $(System.teamProject)/$(Build.BuildNumber)_$(BuildPlatform)$(BuildConfiguration)
\ No newline at end of file
diff --git a/build/pipelines/templates/package-appxbundle.yaml b/build/pipelines/templates/package-appxbundle.yaml
index 1854c898..2965c06e 100644
--- a/build/pipelines/templates/package-appxbundle.yaml
+++ b/build/pipelines/templates/package-appxbundle.yaml
@@ -17,11 +17,7 @@ jobs:
       in(dependencies.BuildARM64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
     ) 
   pool:
-    name: Package ES Custom Demands Lab A
-    demands:
-    - msbuild
-    - visualstudio
-    - ClientAlias -equals PKGESUTILAPPS
+    vmImage: vs2017-win2016
   workspace:
     clean: outputs
   steps:
diff --git a/build/pipelines/templates/prepare-release-internalonly.yaml b/build/pipelines/templates/prepare-release-internalonly.yaml
index fb8caf0d..4949d1ba 100644
--- a/build/pipelines/templates/prepare-release-internalonly.yaml
+++ b/build/pipelines/templates/prepare-release-internalonly.yaml
@@ -14,9 +14,7 @@ jobs:
 - job: WindowsInternalRelease
   dependsOn: Package
   pool:
-    name: Package ES Custom Demands Lab A
-    demands:
-    - ClientAlias -equals PKGESUTILAPPS
+    name: Package ES Lab E
   workspace:
     clean: outputs
   steps: