From efca6093ba448ef9bb67e2086e11195ddf0ac271 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 7 Nov 2019 09:43:32 -0800
Subject: [PATCH] Run larger set of helix tests on non PR builds (#16856)

---
 .azure/pipelines/ci.yml          | 44 +++++++++++++++++++++++++++++++
 .azure/pipelines/helix-daily.yml | 45 --------------------------------
 2 files changed, 44 insertions(+), 45 deletions(-)
 delete mode 100644 .azure/pipelines/helix-daily.yml

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 5114966c0cc..08859c61594 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -570,6 +570,7 @@ stages:
 # Helix x64
   - template: jobs/default-build.yml
     parameters:
+      condition: eq(variables['Build.Reason'], 'PullRequest')
       jobName: Helix_x64
       jobDisplayName: 'Tests: Helix x64'
       agentOs: Windows
@@ -585,6 +586,49 @@ stages:
       - name: Helix_logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
+      
+  - template: jobs/default-build.yml
+    parameters:
+      condition: ne(variables['Build.Reason'], 'PullRequest')
+      jobName: Helix_x64_daily
+      jobDisplayName: 'Tests: Helix x64 Daily'
+      agentOs: Windows
+      timeoutInMinutes: 180
+      steps:
+      - script: .\restore.cmd -ci
+        displayName: Restore
+      - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true -bl
+        displayName: Run build.cmd helix target
+        env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+      artifacts:
+      - name: Helix_logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+
+  # Helix ARM64
+  - template: jobs/default-build.yml
+    parameters:
+      condition: ne(variables['Build.Reason'], 'PullRequest')
+      jobName: Helix_arm64_daily
+      jobDisplayName: "Tests: Helix ARM64 Daily"
+      agentOs: Linux
+      timeoutInMinutes: 180
+      steps:
+      - script: ./restore.sh -ci
+        displayName: Restore
+      - script: ./build.sh -ci --arch arm64 -test --no-build-nodejs -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true -bl
+        displayName: Run build.sh helix arm64 target
+        env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+      installNodeJs: false
+      artifacts:
+      - name: Helix_arm64_logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
       
   # Source build
   - job: Source_Build
diff --git a/.azure/pipelines/helix-daily.yml b/.azure/pipelines/helix-daily.yml
deleted file mode 100644
index 129d4f6a09c..00000000000
--- a/.azure/pipelines/helix-daily.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Uses Scheduled Triggers, which aren't supported in YAML yet.
-# https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
-
-# Daily Helix Tests for ASP.NET Core
-
-jobs:
-- template: jobs/default-build.yml
-  parameters:
-    jobName: Helix_x64_daily
-    jobDisplayName: 'Tests: Helix x64 Daily'
-    agentOs: Windows
-    timeoutInMinutes: 240
-    steps:
-    - script: .\restore.cmd -ci
-      displayName: Restore
-    - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true -bl
-      displayName: Run build.cmd helix target
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
-    artifacts:
-    - name: Helix_logs
-      path: artifacts/log/
-      publishOnError: true
-
-# Helix ARM64
-- template: jobs/default-build.yml
-  parameters:
-    jobName: Helix_arm64_daily
-    jobDisplayName: "Tests: Helix ARM64 Daily"
-    agentOs: Linux
-    timeoutInMinutes: 180
-    steps:
-    - script: ./restore.sh -ci
-      displayName: Restore
-    - script: ./build.sh -ci --arch arm64 -test --no-build-nodejs -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true -bl
-      displayName: Run build.sh helix arm64 target
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
-    installNodeJs: false
-    artifacts:
-    - name: Helix_arm64_logs
-      path: artifacts/log/
-      publishOnError: true
-      includeForks: true
-