From 8440af2409b34aeaa381bfe3c67565436efc11bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Mon, 14 Jun 2021 16:28:33 +0200
Subject: [PATCH] share test compilation output across agents

---
 .../azure-pipelines/darwin/product-build-darwin.yml  | 12 ------------
 build/azure-pipelines/linux/product-build-linux.yml  | 12 ------------
 build/azure-pipelines/product-compile.yml            | 11 +++++++++--
 build/azure-pipelines/win32/product-build-win32.yml  |  7 -------
 4 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 566eeb80522..3d7e8c41aa2 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -185,12 +185,6 @@ steps:
     timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
-      set -e
-      yarn --cwd test/integration/browser compile
-    displayName: Compile integration tests
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
   - script: |
       # Figure out the full absolute path of the product we just built
       # including the remote server and configure the integration tests
@@ -224,12 +218,6 @@ steps:
     timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
-      set -e
-      yarn --cwd test/smoke compile
-    displayName: Compile smoke tests
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
   - script: |
       set -e
       APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 297c40ac28c..e941a6bb82e 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -143,12 +143,6 @@ steps:
     timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
-      set -e
-      yarn --cwd test/integration/browser compile
-    displayName: Compile integration tests
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
   - script: |
       # Figure out the full absolute path of the product we just built
       # including the remote server and configure the integration tests
@@ -184,12 +178,6 @@ steps:
     timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-  - script: |
-      set -e
-      yarn --cwd test/smoke compile
-    displayName: Compile smoke tests
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
   - script: |
       set -e
       APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index 18c17639b83..7ba1220f040 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -38,7 +38,7 @@ steps:
   # using `genericNodeModules` instead of `nodeModules` here to avoid sharing the cache with builds running inside containers
   - task: Cache@2
     inputs:
-      key: 'genericNodeModules | $(Agent.OS) | .build/yarnlockhash'
+      key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
       path: .build/node_modules_cache
       cacheHitVar: NODE_MODULES_RESTORED
     displayName: Restore node_modules cache
@@ -98,6 +98,13 @@ steps:
       yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check
     displayName: Compile & Hygiene
 
+  - script: |
+      set -e
+      yarn --cwd test/smoke compile
+      yarn --cwd test/integration/browser compile
+    displayName: Compile test suites
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
   - script: |
       set -e
       AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
@@ -121,7 +128,7 @@ steps:
   # we gotta tarball everything in order to preserve file permissions
   - script: |
       set -e
-      tar -czf $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-*
+      tar -czf $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-* test/integration/browser/out test/smoke/out test/automation/out
     displayName: Compress compilation artifact
 
   - task: PublishPipelineArtifact@1
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 1f8514ae7e3..ba28eedaaaf 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -154,13 +154,6 @@ steps:
     timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      exec { yarn --cwd test/integration/browser compile }
-    displayName: Compile integration tests
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
-
   - powershell: |
       # Figure out the full absolute path of the product we just built
       # including the remote server and configure the integration tests