Move Web job into its own stage (#155193)

* split web from linux

fixes #155191

* reorder

1 files changed, 164 insertions, 156 deletions

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 46402a8b7f0..958203ec56d 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -108,9 +108,11 @@ variables:
   - name: VSCODE_BUILD_STAGE_WINDOWS
     value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_LINUX
-    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_WEB, true)) }}
+    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_MACOS
     value: ${{ or(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}
+  - name: VSCODE_BUILD_STAGE_WEB
+    value: ${{ eq(parameters.VSCODE_BUILD_WEB, true) }}
   - name: VSCODE_CIBUILD
     value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}
   - name: VSCODE_PUBLISH
@@ -176,45 +178,45 @@ stages:
         pool: vscode-1es-windows
         jobs:
           - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
-            - job: WindowsUnitTests
-              displayName: Unit Tests
-              timeoutInMinutes: 60
-              variables:
-                VSCODE_ARCH: x64
-              steps:
-                - template: win32/product-build-win32.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: true
-                    VSCODE_RUN_INTEGRATION_TESTS: false
-                    VSCODE_RUN_SMOKE_TESTS: false
-            - job: WindowsIntegrationTests
-              displayName: Integration Tests
-              timeoutInMinutes: 60
-              variables:
-                VSCODE_ARCH: x64
-              steps:
-                - template: win32/product-build-win32.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: false
-                    VSCODE_RUN_INTEGRATION_TESTS: true
-                    VSCODE_RUN_SMOKE_TESTS: false
-            - job: WindowsSmokeTests
-              displayName: Smoke Tests
-              timeoutInMinutes: 60
-              variables:
-                VSCODE_ARCH: x64
-              steps:
-                - template: win32/product-build-win32.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: false
-                    VSCODE_RUN_INTEGRATION_TESTS: false
-                    VSCODE_RUN_SMOKE_TESTS: true
+              - job: WindowsUnitTests
+                displayName: Unit Tests
+                timeoutInMinutes: 60
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: true
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: WindowsIntegrationTests
+                displayName: Integration Tests
+                timeoutInMinutes: 60
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: true
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: WindowsSmokeTests
+                displayName: Smoke Tests
+                timeoutInMinutes: 60
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: true
 
           - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32, true)) }}:
               - job: Windows
@@ -291,51 +293,51 @@ stages:
         pool: vscode-1es-linux
         jobs:
           - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
-            - job: Linuxx64UnitTest
-              displayName: Unit Tests
-              container: vscode-bionic-x64
-              variables:
-                VSCODE_ARCH: x64
-                NPM_ARCH: x64
-                DISPLAY: ":10"
-              steps:
-                - template: linux/product-build-linux-client.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: true
-                    VSCODE_RUN_INTEGRATION_TESTS: false
-                    VSCODE_RUN_SMOKE_TESTS: false
-            - job: Linuxx64IntegrationTest
-              displayName: Integration Tests
-              container: vscode-bionic-x64
-              variables:
-                VSCODE_ARCH: x64
-                NPM_ARCH: x64
-                DISPLAY: ":10"
-              steps:
-                - template: linux/product-build-linux-client.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: false
-                    VSCODE_RUN_INTEGRATION_TESTS: true
-                    VSCODE_RUN_SMOKE_TESTS: false
-            - job: Linuxx64SmokeTest
-              displayName: Smoke Tests
-              container: vscode-bionic-x64
-              variables:
-                VSCODE_ARCH: x64
-                NPM_ARCH: x64
-                DISPLAY: ":10"
-              steps:
-                - template: linux/product-build-linux-client.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: false
-                    VSCODE_RUN_INTEGRATION_TESTS: false
-                    VSCODE_RUN_SMOKE_TESTS: true
+              - job: Linuxx64UnitTest
+                displayName: Unit Tests
+                container: vscode-bionic-x64
+                variables:
+                  VSCODE_ARCH: x64
+                  NPM_ARCH: x64
+                  DISPLAY: ":10"
+                steps:
+                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: true
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: Linuxx64IntegrationTest
+                displayName: Integration Tests
+                container: vscode-bionic-x64
+                variables:
+                  VSCODE_ARCH: x64
+                  NPM_ARCH: x64
+                  DISPLAY: ":10"
+                steps:
+                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: true
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: Linuxx64SmokeTest
+                displayName: Smoke Tests
+                container: vscode-bionic-x64
+                variables:
+                  VSCODE_ARCH: x64
+                  NPM_ARCH: x64
+                  DISPLAY: ":10"
+                steps:
+                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: true
 
           - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true)) }}:
               - job: Linuxx64
@@ -430,13 +432,6 @@ stages:
                 steps:
                   - template: linux/product-build-alpine.yml
 
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WEB, true)) }}:
-              - job: LinuxWeb
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: web/product-build-web.yml
-
   - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_MACOS'], true)) }}:
       - stage: macOS
         dependsOn:
@@ -447,62 +442,8 @@ stages:
           BUILDSECMON_OPT_IN: true
         jobs:
           - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
-            - job: macOSUnitTest
-              displayName: Unit Tests
-              timeoutInMinutes: 90
-              variables:
-                VSCODE_ARCH: x64
-              steps:
-                - template: darwin/product-build-darwin.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: true
-                    VSCODE_RUN_INTEGRATION_TESTS: false
-                    VSCODE_RUN_SMOKE_TESTS: false
-            - job: macOSIntegrationTest
-              displayName: Integration Tests
-              timeoutInMinutes: 90
-              variables:
-                VSCODE_ARCH: x64
-              steps:
-                - template: darwin/product-build-darwin.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: false
-                    VSCODE_RUN_INTEGRATION_TESTS: true
-                    VSCODE_RUN_SMOKE_TESTS: false
-            - job: macOSSmokeTest
-              displayName: Smoke Tests
-              timeoutInMinutes: 90
-              variables:
-                VSCODE_ARCH: x64
-              steps:
-                - template: darwin/product-build-darwin.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: false
-                    VSCODE_RUN_INTEGRATION_TESTS: false
-                    VSCODE_RUN_SMOKE_TESTS: true
-
-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS, true)) }}:
-            - job: macOS
-              timeoutInMinutes: 90
-              variables:
-                VSCODE_ARCH: x64
-              steps:
-                - template: darwin/product-build-darwin.yml
-                  parameters:
-                    VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
-                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                    VSCODE_RUN_UNIT_TESTS: false
-                    VSCODE_RUN_INTEGRATION_TESTS: false
-                    VSCODE_RUN_SMOKE_TESTS: false
-
-            - ${{ if eq(parameters.VSCODE_STEP_ON_IT, false) }}:
-              - job: macOSTest
+              - job: macOSUnitTest
+                displayName: Unit Tests
                 timeoutInMinutes: 90
                 variables:
                   VSCODE_ARCH: x64
@@ -511,19 +452,73 @@ stages:
                     parameters:
                       VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                      VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-                      VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                      VSCODE_RUN_UNIT_TESTS: true
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: macOSIntegrationTest
+                displayName: Integration Tests
+                timeoutInMinutes: 90
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: darwin/product-build-darwin.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: true
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: macOSSmokeTest
+                displayName: Smoke Tests
+                timeoutInMinutes: 90
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: darwin/product-build-darwin.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: true
 
-            - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
-              - job: macOSSign
-                dependsOn:
-                  - macOS
+          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS, true)) }}:
+              - job: macOS
                 timeoutInMinutes: 90
                 variables:
                   VSCODE_ARCH: x64
                 steps:
-                  - template: darwin/product-build-darwin-sign.yml
+                  - template: darwin/product-build-darwin.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+
+              - ${{ if eq(parameters.VSCODE_STEP_ON_IT, false) }}:
+                  - job: macOSTest
+                    timeoutInMinutes: 90
+                    variables:
+                      VSCODE_ARCH: x64
+                    steps:
+                      - template: darwin/product-build-darwin.yml
+                        parameters:
+                          VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                          VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                          VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                          VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                          VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+
+              - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
+                  - job: macOSSign
+                    dependsOn:
+                      - macOS
+                    timeoutInMinutes: 90
+                    variables:
+                      VSCODE_ARCH: x64
+                    steps:
+                      - template: darwin/product-build-darwin-sign.yml
 
           - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
               - job: macOSARM64
@@ -570,6 +565,19 @@ stages:
                     steps:
                       - template: darwin/product-build-darwin-sign.yml
 
+  - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WEB'], true)) }}:
+      - stage: Web
+        dependsOn:
+          - Compile
+        pool: vscode-1es-linux
+        jobs:
+          - ${{ if eq(parameters.VSCODE_BUILD_WEB, true) }}:
+              - job: Web
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: web/product-build-web.yml
+
   - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), ne(variables['VSCODE_PUBLISH'], 'false')) }}:
       - stage: Publish
         dependsOn: