Move official builds to OSX 10.14 pool (#2159)

* Move official builds to OSX 10.14 pool

* Use vmImage instead

diff --git a/eng/pipelines/common/checkout-job.yml b/eng/pipelines/common/checkout-job.yml
index a46268e..297a4b5 100644 (file)
--- a/eng/pipelines/common/checkout-job.yml
+++ b/eng/pipelines/common/checkout-job.yml
@@ -32,11 +32,7 @@ jobs:
   displayName: Checkout
 
   pool:
-    ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      name: Hosted MacOS
-
-    ${{ if ne(variables['System.TeamProject'], 'public') }}:
-      name: Hosted Mac Internal
+    vmImage: 'macOS-10.14'
 
   steps:
   - checkout: self

diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
index f1be98f..02919c4 100644 (file)
--- a/eng/pipelines/common/xplat-setup.yml
+++ b/eng/pipelines/common/xplat-setup.yml
@@ -83,13 +83,9 @@ jobs:
         ${{ if and(eq(parameters.osGroup, 'FreeBSD'), ne(variables['System.TeamProject'], 'public')) }}:
           name: dnceng-freebsd-internal
 
-        # Official Build OSX Pool
-        ${{ if and(eq(parameters.osGroup, 'OSX'), ne(variables['System.TeamProject'], 'public')) }}:
-          name: Hosted Mac Internal
-
         # Public OSX Build Pool
-        ${{ if and(eq(parameters.osGroup, 'OSX'), eq(variables['System.TeamProject'], 'public')) }}:
-          name: Hosted macOS
+        ${{ if eq(parameters.osGroup, 'OSX') }}:
+          vmImage: 'macOS-10.14'
 
         # Official Build Windows Pool
         ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: