From 9131c63b9f050c826d1aa009c1789a5688af14e0 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Thu, 30 Sep 2021 23:40:49 -0700
Subject: [PATCH] Skip Helix tests when skipping tests - also make `Skip
 tests?` option visible when starting manual runs

---
 .azure/pipelines/ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 391a763f699c..0c33783282f5 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -18,6 +18,13 @@ pr:
     include:
     - '*'
 
+# Choose whether to skip tests when running pipeline manually.
+parameters:
+- name: skipTests
+  default: false
+  displayName: Skip tests?
+  type: boolean
+
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
@@ -639,11 +646,10 @@ stages:
       parameters:
         inputName: Linux_musl_arm64
 
-  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest'), in(variables['Build.Reason'], 'Manual')) }}:
+  - ${{ if and(ne(parameters.skipTests, 'true'), or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest'), in(variables['Build.Reason'], 'Manual'))) }}:
     # Test jobs
     - template: jobs/default-build.yml
       parameters:
-        condition: ne(variables['SkipTests'], 'true')
         jobName: Windows_Test
         jobDisplayName: "Test: Windows Server 2016 x64"
         agentOs: Windows
@@ -669,7 +675,6 @@ stages:
 
     - template: jobs/default-build.yml
       parameters:
-        condition: ne(variables['SkipTests'], 'true')
         jobName: MacOS_Test
         jobDisplayName: "Test: macOS 10.15"
         agentOs: macOS
@@ -691,7 +696,6 @@ stages:
 
     - template: jobs/default-build.yml
       parameters:
-        condition: ne(variables['SkipTests'], 'true')
         jobName: Linux_Test
         jobDisplayName: "Test: Ubuntu 18.04 x64"
         agentOs: Linux