Engineering - update Code OSS pipeline

build/azure-pipelines/darwin/product-build-darwin-test.yml

@@ -1,4 +1,6 @@
 parameters:
+  - name: VSCODE_QUALITY
+    type: string
   - name: VSCODE_RUN_UNIT_TESTS
     type: boolean
   - name: VSCODE_RUN_INTEGRATION_TESTS
@@ -14,25 +16,43 @@ steps:
     displayName: Download Electron and Playwright
 
   - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
-    - script: |
-        set -e
-        ./scripts/test.sh --build --tfs "Unit Tests"
-      displayName: Run unit tests (Electron)
-      timeoutInMinutes: 15
-
-  - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
-    - script: |
-        set -e
-        yarn test-node --build
-      displayName: Run unit tests (node.js)
-      timeoutInMinutes: 15
-
-  - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
-    - script: |
-        set -e
-        DEBUG=*browser* yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
-      displayName: Run unit tests (Browser, Chromium & Webkit)
-      timeoutInMinutes: 30
+    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+      - script: |
+          set -e
+          ./scripts/test.sh --tfs "Unit Tests"
+        displayName: Run unit tests (Electron)
+        timeoutInMinutes: 15
+
+      - script: |
+          set -e
+          yarn test-node
+        displayName: Run unit tests (node.js)
+        timeoutInMinutes: 15
+
+      - script: |
+          set -e
+          DEBUG=*browser* yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
+        displayName: Run unit tests (Browser, Chromium & Webkit)
+        timeoutInMinutes: 30
+
+    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+      - script: |
+          set -e
+          ./scripts/test.sh --build --tfs "Unit Tests"
+        displayName: Run unit tests (Electron)
+        timeoutInMinutes: 15
+
+      - script: |
+          set -e
+          yarn test-node --build
+        displayName: Run unit tests (node.js)
+        timeoutInMinutes: 15
+
+      - script: |
+          set -e
+          DEBUG=*browser* yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+        displayName: Run unit tests (Browser, Chromium & Webkit)
+        timeoutInMinutes: 30
 
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - script: |
@@ -57,38 +77,42 @@ steps:
           compile-extension:vscode-test-resolver
       displayName: Build integration tests
 
-  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
-    - script: |
-        # Figure out the full absolute path of the product we just built
-        # including the remote server and configure the integration tests
-        # to run with these builds instead of running out of sources.
-        set -e
-        APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-        APP_NAME="`ls $APP_ROOT | head -n 1`"
-        INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-        VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
-        ./scripts/test-integration.sh --build --tfs "Integration Tests"
-      displayName: Run integration tests (Electron)
-      timeoutInMinutes: 20
-
-  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
-    - script: |
-        set -e
-        VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \
-        ./scripts/test-web-integration.sh --browser webkit
-      displayName: Run integration tests (Browser, Webkit)
-      timeoutInMinutes: 20
-
-  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
-    - script: |
-        set -e
-        APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-        APP_NAME="`ls $APP_ROOT | head -n 1`"
-        INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-        VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
-        ./scripts/test-remote-integration.sh
-      displayName: Run integration tests (Remote)
-      timeoutInMinutes: 20
+    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+      - script: |
+          ./scripts/test-integration.sh --tfs "Integration Tests"
+        displayName: Run integration tests (Electron)
+        timeoutInMinutes: 20
+
+    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+      - script: |
+          # Figure out the full absolute path of the product we just built
+          # including the remote server and configure the integration tests
+          # to run with these builds instead of running out of sources.
+          set -e
+          APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+          APP_NAME="`ls $APP_ROOT | head -n 1`"
+          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
+          ./scripts/test-integration.sh --build --tfs "Integration Tests"
+        displayName: Run integration tests (Electron)
+        timeoutInMinutes: 20
+
+      - script: |
+          set -e
+          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \
+          ./scripts/test-web-integration.sh --browser webkit
+        displayName: Run integration tests (Browser, Webkit)
+        timeoutInMinutes: 20
+
+      - script: |
+          set -e
+          APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+          APP_NAME="`ls $APP_ROOT | head -n 1`"
+          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
+          ./scripts/test-remote-integration.sh
+        displayName: Run integration tests (Remote)
+        timeoutInMinutes: 20
 
   - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
     - script: |
@@ -98,35 +122,44 @@ steps:
       continueOnError: true
       condition: succeededOrFailed()
 
-  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
-    - script: |
-        set -e
-        VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \
-        yarn smoketest-no-compile --web --tracing --headless
-      timeoutInMinutes: 20
-      displayName: Run smoke tests (Browser, Chromium)
+    - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+      - script: |
+          set -e
+          yarn --cwd test/smoke compile
+        displayName: Compile smoke tests
+
+      - script: |
+          set -e
+          yarn smoketest-no-compile --tracing
+        timeoutInMinutes: 20
+        displayName: Run smoke tests (Electron)
+
+    - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+      - script: |
+          set -e
+          APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+          APP_NAME="`ls $APP_ROOT | head -n 1`"
+          yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME"
+        timeoutInMinutes: 20
+        displayName: Run smoke tests (Electron)
+
+      - script: |
+          set -e
+          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \
+          yarn smoketest-no-compile --web --tracing --headless
+        timeoutInMinutes: 20
+        displayName: Run smoke tests (Browser, Chromium)
+
+      - script: |
+          set -e
+          yarn gulp compile-extension:vscode-test-resolver
+          APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+          APP_NAME="`ls $APP_ROOT | head -n 1`"
+          VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
+          yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME"
+        timeoutInMinutes: 20
+        displayName: Run smoke tests (Remote)
 
-  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
-    - script: |
-        set -e
-        APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-        APP_NAME="`ls $APP_ROOT | head -n 1`"
-        yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME"
-      timeoutInMinutes: 20
-      displayName: Run smoke tests (Electron)
-
-  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
-    - script: |
-        set -e
-        yarn gulp compile-extension:vscode-test-resolver
-        APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-        APP_NAME="`ls $APP_ROOT | head -n 1`"
-        VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \
-        yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME"
-      timeoutInMinutes: 20
-      displayName: Run smoke tests (Remote)
-
-  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
     - script: |
         set -e
         ps -ef
@@ -148,7 +181,6 @@ steps:
       continueOnError: true
       condition: failed()
 
-  - ${{ if or(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
     # In order to properly symbolify above crash reports
     # (if any), we need the compiled native modules too
     - task: PublishPipelineArtifact@0
@@ -164,7 +196,6 @@ steps:
       continueOnError: true
       condition: failed()
 
-  - ${{ if or(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
     - task: PublishPipelineArtifact@0
       inputs:
         targetPath: .build/logs

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -11,6 +11,11 @@ parameters:
     type: boolean
 
 steps:
+  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+    - checkout: self
+      fetchDepth: 1
+      retryCountOnTaskFailure: 3
+
   - task: NodeTool@0
     inputs:
       versionSpec: "16.x"
@@ -23,16 +28,18 @@ steps:
         KeyVaultName: vscode
         SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: Compilation
-      path: $(Build.ArtifactStagingDirectory)
-    displayName: Download compilation output
+  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: Compilation
+        path: $(Build.ArtifactStagingDirectory)
+      displayName: Download compilation output
 
-  - script: |
-      set -e
-      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-    displayName: Extract compilation output
+  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+    - script: |
+        set -e
+        tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+      displayName: Extract compilation output
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
@@ -123,29 +130,39 @@ steps:
         node build/azure-pipelines/mixin
       displayName: Mix in quality
 
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
-    displayName: Build client
+  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+    - script: |
+        set -e
+        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+          yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
+      displayName: Build client
 
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
         set -e
         node build/azure-pipelines/mixin --server
       displayName: Mix in server quality
 
-  - script: |
-      set -e
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
-    displayName: Build Server
+  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
+    - script: |
+        set -e
+        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+          yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci
+        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+          yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci
+      displayName: Build Server
+
+  - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
+    - script: |
+        set -e
+        VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+          yarn gulp "transpile-client" "transpile-extensions"
+      displayName: Transpile
 
   - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
     - template: product-build-darwin-test.yml
       parameters:
+        VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}