From 5a0deca3d8dd7acbf473876072b5fa70dfd672bb Mon Sep 17 00:00:00 2001
From: Michael Niksa <miniksa@microsoft.com>
Date: Wed, 19 Aug 2020 12:31:03 -0700
Subject: [PATCH] Set ProcessTestResults job to use conditions specified in
 parent (#7347)

Activating a template doesn't actually process conditions. Only jobs, stages, and tasks can process a condition. So specify the full condition in the parent template call as a parameter and ask the child job (who can actually evaluate the condition) to use that parameter to determine if it should run.
---
 build/pipelines/templates/build-console-ci.yml             | 2 +-
 build/pipelines/templates/helix-processtestresults-job.yml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/pipelines/templates/build-console-ci.yml b/build/pipelines/templates/build-console-ci.yml
index b60c823748..d611a93540 100644
--- a/build/pipelines/templates/build-console-ci.yml
+++ b/build/pipelines/templates/build-console-ci.yml
@@ -30,6 +30,6 @@ jobs:
   parameters:
     dependsOn:
     - RunTestsInHelix
-    condition: and(succeeded(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) 
+    condition: and(succeededOrFailed(), and(eq('${{ parameters.platform }}', 'x64'), not(eq(variables['Build.Reason'], 'PullRequest')))) 
     rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
     minimumExpectedTestsExecutedCount: ${{ parameters.minimumExpectedTestsExecutedCount }}
\ No newline at end of file
diff --git a/build/pipelines/templates/helix-processtestresults-job.yml b/build/pipelines/templates/helix-processtestresults-job.yml
index f1c18db4fd..9d301e9cb6 100644
--- a/build/pipelines/templates/helix-processtestresults-job.yml
+++ b/build/pipelines/templates/helix-processtestresults-job.yml
@@ -1,4 +1,5 @@
 parameters:
+  condition: 'succeededOrFailed()'
   dependsOn: ''
   rerunPassesRequiredToAvoidFailure: 5
   minimumExpectedTestsExecutedCount: 10
@@ -7,7 +8,7 @@ parameters:
 
 jobs:
 - job: ProcessTestResults
-  condition: succeededOrFailed()
+  condition: ${{ parameters.condition }}
   dependsOn: ${{ parameters.dependsOn }}
   pool:
     vmImage: 'windows-2019'