From ab8abf2fd75287afbe78609c9b4035c7030b1d14 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 9 Dec 2020 16:32:03 -0800
Subject: [PATCH] Split out Unit Tests and Smoke Tests as separate Jobs in the
 Pipeline for #3560

---
 SmokeTests/SmokeTests.proj |  2 +-
 azure-pipelines.yml        | 60 +++++++++++++++++++++++---------------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index 4ae1f8184b2..0da3dd81c36 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -12,7 +12,7 @@
           Inputs="@(ProjectsToBuild)"
           Outputs="%(Filename)">
 
-    <Message Importance="High" Text="Building project %(ProjectsToBuild.Filename): (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))" />
+    <Message Importance="High" Text="Building project %(ProjectsToBuild.Identity): (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))" />
 
     <MSBuild Projects="SmokeTest.csproj"
               Targets="restore;build"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 16784b4146b..0250d4f62e6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,8 +13,9 @@ variables:
   BuildConfiguration: Release
 
 jobs:
-- job: ToolkitBuild
-  timeoutInMinutes: 120
+### BUILD ###
+- job: BuildBits
+  timeoutInMinutes: 60
   
   steps:
   - task: BatchScript@1
@@ -45,15 +46,35 @@ jobs:
   - powershell: .\build\build.ps1 -target=Build
     displayName: Build
 
-  - powershell: .\build\build.ps1 -target=Test
-    displayName: Test
-    timeoutInMinutes: 15
-
   - powershell: .\build\build.ps1 -target=Package
     displayName: Package
 
-  - powershell: .\build\build.ps1 -target=SmokeTest
-    displayName: SmokeTest
+  - task: PowerShell@2
+    displayName: Authenticode Sign Packages
+    inputs:
+      filePath: build/Sign-Package.ps1
+    env:
+      SignClientUser: $(SignClientUser)
+      SignClientSecret: $(SignClientSecret)
+      ArtifactDirectory: bin\nupkg
+    condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Package Artifacts
+    inputs:
+      pathToPublish: .\bin\nupkg
+      artifactType: container
+      artifactName: Packages
+
+### Unit Tests ###
+
+- job: UnitTests
+  dependsOn: BuildBits
+  timeoutInMinutes: 20
+  
+  steps:
+  - powershell: .\build\build.ps1 -target=Test
+    displayName: Test    
 
   - task: PublishTestResults@2
     inputs:
@@ -76,22 +97,15 @@ jobs:
       artifactName: WexErrorLogFileOutput
     condition: failed()
 
-  - task: PowerShell@2
-    displayName: Authenticode Sign Packages
-    inputs:
-      filePath: build/Sign-Package.ps1
-    env:
-      SignClientUser: $(SignClientUser)
-      SignClientSecret: $(SignClientSecret)
-      ArtifactDirectory: bin\nupkg
-    condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
+### Smoke Tests ###
 
-  - task: PublishBuildArtifacts@1
-    displayName: Publish Package Artifacts
-    inputs:
-      pathToPublish: .\bin\nupkg
-      artifactType: container
-      artifactName: Packages
+- job: SmokeTests
+  dependsOn: BuildBits
+  timeoutInMinutes: 40
+  
+  steps:
+  - powershell: .\build\build.ps1 -target=SmokeTest
+    displayName: SmokeTest
 
   - task: CopyFiles@2
     inputs: