From 33094f306c8868f75bafe3f30879e14a006ef7b1 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 16 Dec 2025 14:32:43 +0000
Subject: [PATCH] Engineering - update product pipeline to allow testing new
 macOS pool (#283817)

* Fix compile stage

* Lift stage information for easier testing

* Update macOS test steps
---
 build/azure-pipelines/product-build-macos.yml | 65 +++++--------------
 build/azure-pipelines/product-build.yml       |  3 +
 build/azure-pipelines/product-compile.yml     |  3 -
 3 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/build/azure-pipelines/product-build-macos.yml b/build/azure-pipelines/product-build-macos.yml
index 547649322cf..3f61b794ac0 100644
--- a/build/azure-pipelines/product-build-macos.yml
+++ b/build/azure-pipelines/product-build-macos.yml
@@ -71,16 +71,13 @@ extends:
         image: onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest
     stages:
       - stage: Compile
+        pool:
+          name: AcesShared
+          os: macOS
+          demands:
+            - ImageOverride -equals ACES_VM_SharedPool_Sequoia
         jobs:
-          - job: Compile
-            timeoutInMinutes: 90
-            pool:
-              name: AcesShared
-              os: macOS
-              demands:
-                - ImageOverride -equals ACES_VM_SharedPool_Sequoia
-            steps:
-              - template: build/azure-pipelines/product-compile.yml@self
+          - template: build/azure-pipelines/product-compile.yml@self
 
       - stage: macOS
         dependsOn:
@@ -93,41 +90,15 @@ extends:
         variables:
           BUILDSECMON_OPT_IN: true
         jobs:
-          - job: macOSElectronTest
-            displayName: Electron Tests
-            timeoutInMinutes: 30
-            variables:
-              VSCODE_ARCH: arm64
-            steps:
-              - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
-                parameters:
-                  VSCODE_ARCH: arm64
-                  VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-                  VSCODE_TEST_ARTIFACT_NAME: electron
-                  VSCODE_RUN_ELECTRON_TESTS: true
-
-          - job: macOSBrowserTest
-            displayName: Browser Tests
-            timeoutInMinutes: 30
-            variables:
-              VSCODE_ARCH: arm64
-            steps:
-              - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
-                parameters:
-                  VSCODE_ARCH: arm64
-                  VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-                  VSCODE_TEST_ARTIFACT_NAME: browser
-                  VSCODE_RUN_BROWSER_TESTS: true
-
-          - job: macOSRemoteTest
-            displayName: Remote Tests
-            timeoutInMinutes: 30
-            variables:
-              VSCODE_ARCH: arm64
-            steps:
-              - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
-                parameters:
-                  VSCODE_ARCH: arm64
-                  VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-                  VSCODE_TEST_ARTIFACT_NAME: remote
-                  VSCODE_RUN_REMOTE_TESTS: true
+          - template: build/azure-pipelines/darwin/product-build-darwin-ci.yml@self
+            parameters:
+              VSCODE_CIBUILD: true
+              VSCODE_TEST_SUITE: Electron
+          - template: build/azure-pipelines/darwin/product-build-darwin-ci.yml@self
+            parameters:
+              VSCODE_CIBUILD: true
+              VSCODE_TEST_SUITE: Browser
+          - template: build/azure-pipelines/darwin/product-build-darwin-ci.yml@self
+            parameters:
+              VSCODE_CIBUILD: true
+              VSCODE_TEST_SUITE: Remote
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index e9c8f74e659..516b3b4fffd 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -190,6 +190,9 @@ extends:
         image: onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest
     stages:
       - stage: Compile
+        pool:
+          name: AcesShared
+          os: macOS
         jobs:
           - template: build/azure-pipelines/product-compile.yml@self
 
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index 7990c3b545d..09fee37b2eb 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -1,9 +1,6 @@
 jobs:
   - job: Compile
     timeoutInMinutes: 60
-    pool:
-      name: AcesShared
-      os: macOS
     templateContext:
       outputs:
         - output: pipelineArtifact