From b14f95c9fccba8212dfc4db2d2cd17123a1c764d Mon Sep 17 00:00:00 2001
From: Matt Cooper <mattc@xbox.com>
Date: Mon, 3 Dec 2018 09:54:05 -0500
Subject: [PATCH] replace `queue` with new `pool` syntax

---
 azure-pipelines-integration.yml | 12 +++----
 azure-pipelines.yml             | 56 +++++++++++++++------------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
index 2ff0a28e1c3..e4bd1f74794 100644
--- a/azure-pipelines-integration.yml
+++ b/azure-pipelines-integration.yml
@@ -1,14 +1,14 @@
-phases:
-- phase: Windows_VisualStudio_Integration_Tests
-  queue:
-    name: dotnet-external-temp-vs2017
-    timeoutInMinutes: 90
-    parallel: 2
+jobs:
+- job: Windows_VisualStudio_Integration_Tests
+  pool: dotnet-external-temp-vs2017
+  strategy:
+    maxParallel: 2
     matrix:
       debug:
         _configuration: Debug
       release:
         _configuration: Release
+  timeoutInMinutes: 90
 
   steps:
     - script: build/scripts/cibuild.cmd -configuration $(_configuration) -testVsi 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 76343e25aa7..2d770bcce54 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,9 +1,8 @@
-phases:
-- phase: Windows_Desktop_Unit_Tests
-  queue:
-    name: dotnet-external-temp
-    timeoutInMinutes: 90
-    parallel: 4
+jobs:
+- job: Windows_Desktop_Unit_Tests
+  pool: dotnet-external-temp
+  strategy:
+    maxParallel: 4
     matrix:
       debug_32:
         _configuration: Debug
@@ -17,6 +16,7 @@ phases:
       release_64:
         _configuration: Release
         _testKind: Test64
+  timeoutInMinutes: 90
 
   steps:
     - script: build/scripts/cibuild.cmd -configuration $(_configuration) -testDesktop -$(_testKind)
@@ -39,10 +39,9 @@ phases:
       continueOnError: true
       condition: not(succeeded())
 
-- phase: Windows_Desktop_Spanish_Unit_Tests
-  queue:
-    name: dnceng-windows-spanish-external-temp
-    timeoutInMinutes: 90
+- job: Windows_Desktop_Spanish_Unit_Tests
+  pool: dnceng-windows-spanish-external-temp
+  timeoutInMinutes: 90
 
   steps:
     - script: build/scripts/cibuild.cmd -configuration Debug -testDesktop
@@ -64,16 +63,16 @@ phases:
       continueOnError: true
       condition: failed()
 
-- phase: Windows_CoreClr_Unit_Tests
-  queue:
-    name: dotnet-external-temp
-    timeoutInMinutes: 90
-    parallel: 2
+- job: Windows_CoreClr_Unit_Tests
+  pool: dotnet-external-temp
+  strategy:
+    maxParallel: 2
     matrix:
       debug:
         _configuration: Debug
       release:
         _configuration: Release
+  timeoutInMinutes: 90
 
   steps:
     - script: build/scripts/cibuild.cmd -configuration $(_configuration) -testCoreClr -buildCoreClr
@@ -95,11 +94,10 @@ phases:
         publishLocation: Container
       continueOnError: true
       condition: not(succeeded())
-
-- phase: Windows_Determinism_Test
-  queue:
-    name: dotnet-external-temp
-    timeoutInMinutes: 90
+           
+- job: Windows_Determinism_Test
+  pool: dotnet-external-temp
+  timeoutInMinutes: 90
   steps:
     - script: build/scripts/cibuild.cmd -testDeterminism
       displayName: Build - Validate determinism
@@ -113,10 +111,9 @@ phases:
       continueOnError: true
       condition: not(succeeded())
 
-- phase: Windows_Correctness_Test
-  queue:
-    name: dotnet-external-temp
-    timeoutInMinutes: 90
+- job: Windows_Correctness_Test
+  pool: dotnet-external-temp
+  timeoutInMinutes: 90
   steps:
     - script: build/scripts/test-build-correctness.cmd -configuration Release -cibuild
       displayName: Build - Validate correctness
@@ -130,11 +127,10 @@ phases:
       continueOnError: true
       condition: not(succeeded())
 
-- phase: Linux_Test
-  queue:
-    name: DotNetCore-Linux
-    timeoutInMinutes: 90
-    parallel: 2
+- job: Linux_Test
+  pool: DotNetCore-Linux                     
+  strategy:
+    maxParallel: 2
     matrix:
       coreclr:
         _args: --configuration Debug
@@ -143,7 +139,7 @@ phases:
       mono:
         _args: --configuration Debug --docker --mono
         _name: Mono
-        _configuration: Debug
+  timeoutInMinutes: 90
   steps:
     - script: ./build/scripts/cibuild.sh $(_args)
       displayName: Build and Test
-- 
GitLab