From b77f20ec4c609fee7af9edea413eb3308761ac65 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Wed, 16 Feb 2022 19:55:46 -0800
Subject: [PATCH] Recombine osx and normal ci. (#23144)

* Some of the Windows runs have started to exceed 24 hours now as well as the MacOS ones as we have added more ports.
* We are no longer trying to constantly "psychic debug" why ports are failing; CI passes somewhat regularly now, and the failures we get seem to be much more deterministic.
* We're still budget constrained on Azure resources (and have been a bit over budget)

To that end, we're going back off nightly CI runs to Monday Wednesday Friday (like osx already is), so we no longer need separate bits for them.
---
 scripts/azure-pipelines/azure-pipelines-osx.yml | 10 ----------
 scripts/azure-pipelines/azure-pipelines.yml     |  7 +++----
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 scripts/azure-pipelines/azure-pipelines-osx.yml

diff --git a/scripts/azure-pipelines/azure-pipelines-osx.yml b/scripts/azure-pipelines/azure-pipelines-osx.yml
deleted file mode 100644
index e392efb4c6..0000000000
--- a/scripts/azure-pipelines/azure-pipelines-osx.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: MIT
-#
-variables:
-  osx-pool: 'PrOsx-2022-02-04'
-
-jobs:
-- template: osx/azure-pipelines.yml
-  parameters:
-    poolName: $(osx-pool)
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 461eed33d9..f9199b8c45 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -49,10 +49,9 @@ jobs:
     jobName: arm_uwp
     poolName: $(windows-pool)
 
-- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-  - template: osx/azure-pipelines.yml
-    parameters:
-      poolName: $(osx-pool)
+- template: osx/azure-pipelines.yml
+  parameters:
+    poolName: $(osx-pool)
 
 - template: linux/azure-pipelines.yml
   parameters: