Split integration test build from test run

azure-pipelines-integration-corehost.yml

@@ -70,34 +70,28 @@ parameters:
   type: number
   default: 150
 
-jobs:
-- job: VS_Integration_CoreHost_Debug
-  pool:
-    name: ${{ parameters.poolName }}
-    demands: ImageOverride -equals ${{ parameters.queueName }}
-  timeoutInMinutes: ${{ parameters.timeout }}
-  variables:
-    - name: XUNIT_LOGS
-      value: $(Build.SourcesDirectory)\artifacts\log\Debug
-  steps:
-    - template: eng/pipelines/test-integration-job.yml
-      parameters:
-        configuration: Debug
-        oop64bit: true
+stages:
+- template: eng/pipelines/test-integration-helix.yml
+  parameters:
+    poolName: ${{ parameters.poolName }}
+    queueName: ${{ parameters.queueName }}
+    timeout: ${{ parameters.timeout }}
+    configuration: Debug
+    testRuns:
+      - oop64bit: true
         oopCoreClr: true
+        lspEditor: false
+        runName: VS_Integration_CoreHost_Debug
 
 - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-  - job: VS_Integration_CoreHost_Release
-    pool:
-      name: ${{ parameters.poolName }}
-      demands: ImageOverride -equals ${{ parameters.queueName }}
-    timeoutInMinutes: ${{ parameters.timeout }}
-    variables:
-      - name: XUNIT_LOGS
-        value: $(Build.SourcesDirectory)\artifacts\log\Debug
-    steps:
-      - template: eng/pipelines/test-integration-job.yml
-        parameters:
-          configuration: Release
-          oop64bit: true
+  - template: eng/pipelines/test-integration-helix.yml
+    parameters:
+      poolName: ${{ parameters.poolName }}
+      queueName: ${{ parameters.queueName }}
+      timeout: ${{ parameters.timeout }}
+      configuration: Release
+      testRuns:
+        - oop64bit: true
           oopCoreClr: true
+          lspEditor: false
+          runName: VS_Integration_CoreHost_Release

azure-pipelines-integration-lsp.yml

@@ -56,20 +56,15 @@ parameters:
   type: number
   default: 150
 
-variables:
-- name: XUNIT_LOGS
-  value: $(Build.SourcesDirectory)\artifacts\log\$(_configuration)
-
-jobs:
-- job: VS_Integration_LSP
-  pool:
-    name: ${{ parameters.poolName }}
-    demands: ImageOverride -equals ${{ parameters.queueName }}
-  timeoutInMinutes: ${{ parameters.timeout }}
-
-  steps:
-    - template: eng/pipelines/test-integration-job.yml
-      parameters:
-        configuration: Debug
-        oop64bit: true
+stages:
+- template: eng/pipelines/test-integration-helix.yml
+  parameters:
+    poolName: ${{ parameters.poolName }}
+    queueName: ${{ parameters.queueName }}
+    timeout: ${{ parameters.timeout }}
+    configuration: Debug
+    testRuns:
+      - oop64bit: true
+        oopCoreClr: false
         lspEditor: true
+        runName: VS_Integration_LSP_Debug_64

azure-pipelines-integration-scouting.yml

@@ -34,62 +34,34 @@ parameters:
   default: 150
 
 stages:
-- stage: Debug_Integration
-  dependsOn: []
-  variables:
-  - name: XUNIT_LOGS
-    value: $(Build.SourcesDirectory)\artifacts\log\Debug
-  jobs:
-  - job: VS_Integration_Debug_32
-    pool:
-      name: ${{ parameters.poolName }}
-      demands: ImageOverride -equals ${{ parameters.queueName }}
-    timeoutInMinutes: ${{ parameters.timeout }}
-    steps:
-      - template: eng/pipelines/test-integration-job.yml
-        parameters:
-          configuration: Debug
-          oop64bit: false
-          lspEditor: false
+- template: eng/pipelines/test-integration-helix.yml
+  parameters:
+    poolName: ${{ parameters.poolName }}
+    queueName: ${{ parameters.queueName }}
+    timeout: ${{ parameters.timeout }}
+    configuration: Debug
+    testRuns:
+      - oop64bit: false
+        oopCoreClr: false
+        lspEditor: false
+        runName: VS_Integration_Debug_32
+      - oop64bit: true
+        oopCoreClr: false
+        lspEditor: false
+        runName: VS_Integration_Debug_64
 
-  - job: VS_Integration_Debug_64
-    pool:
-      name: ${{ parameters.poolName }}
-      demands: ImageOverride -equals ${{ parameters.queueName }}
-    timeoutInMinutes: ${{ parameters.timeout }}
-    steps:
-      - template: eng/pipelines/test-integration-job.yml
-        parameters:
-          configuration: Debug
-          oop64bit: true
-          lspEditor: false
-
-- stage: Release_Integration
-  dependsOn: []
-  variables:
-  - name: XUNIT_LOGS
-    value: $(Build.SourcesDirectory)\artifacts\log\Release
-  jobs:
-  - job: VS_Integration_Release_32
-    pool:
-      name: ${{ parameters.poolName }}
-      demands: ImageOverride -equals ${{ parameters.queueName }}
-    timeoutInMinutes: ${{ parameters.timeout }}
-    steps:
-      - template: eng/pipelines/test-integration-job.yml
-        parameters:
-          configuration: Release
-          oop64bit: false
-          lspEditor: false
-
-  - job: VS_Integration_Release_64
-    pool:
-      name: ${{ parameters.poolName }}
-      demands: ImageOverride -equals ${{ parameters.queueName }}
-    timeoutInMinutes: ${{ parameters.timeout }}
-    steps:
-      - template: eng/pipelines/test-integration-job.yml
-        parameters:
-          configuration: Release
-          oop64bit: true
-          lspEditor: false
+- template: eng/pipelines/test-integration-helix.yml
+  parameters:
+    poolName: ${{ parameters.poolName }}
+    queueName: ${{ parameters.queueName }}
+    timeout: ${{ parameters.timeout }}
+    configuration: Release
+    testRuns:
+      - oop64bit: false
+        oopCoreClr: false
+        lspEditor: false
+        runName: VS_Integration_Release_32
+      - oop64bit: true
+        oopCoreClr: false
+        lspEditor: false
+        runName: VS_Integration_Release_64

azure-pipelines-integration.yml

@@ -68,64 +68,36 @@ parameters:
   default: 150
 
 stages:
-- stage: Debug_Integration
-  dependsOn: []
-  variables:
-  - name: XUNIT_LOGS
-    value: $(Build.SourcesDirectory)\artifacts\log\Debug
-  jobs:
-  - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-    - job: VS_Integration_Debug_32
-      pool:
-        name: ${{ parameters.poolName }}
-        demands: ImageOverride -equals ${{ parameters.queueName }}
-      timeoutInMinutes: ${{ parameters.timeout }}
-      steps:
-        - template: eng/pipelines/test-integration-job.yml
-          parameters:
-            configuration: Debug
-            oop64bit: false
-            lspEditor: false
-
-  - job: VS_Integration_Debug_64
-    pool:
-      name: ${{ parameters.poolName }}
-      demands: ImageOverride -equals ${{ parameters.queueName }}
-    timeoutInMinutes: ${{ parameters.timeout }}
-    steps:
-      - template: eng/pipelines/test-integration-job.yml
-        parameters:
-          configuration: Debug
-          oop64bit: true
+- template: eng/pipelines/test-integration-helix.yml
+  parameters:
+    poolName: ${{ parameters.poolName }}
+    queueName: ${{ parameters.queueName }}
+    timeout: ${{ parameters.timeout }}
+    configuration: Debug
+    testRuns:
+      - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        - oop64bit: false
+          oopCoreClr: false
           lspEditor: false
+          runName: VS_Integration_Debug_32
+      - oop64bit: true
+        oopCoreClr: false
+        lspEditor: false
+        runName: VS_Integration_Debug_64
 
-- stage: Release_Integration
-  dependsOn: []
-  variables:
-  - name: XUNIT_LOGS
-    value: $(Build.SourcesDirectory)\artifacts\log\Release
-  jobs:
-  - job: VS_Integration_Release_32
-    pool:
-      name: ${{ parameters.poolName }}
-      demands: ImageOverride -equals ${{ parameters.queueName }}
-    timeoutInMinutes: ${{ parameters.timeout }}
-    steps:
-      - template: eng/pipelines/test-integration-job.yml
-        parameters:
-          configuration: Release
-          oop64bit: false
+- template: eng/pipelines/test-integration-helix.yml
+  parameters:
+    poolName: ${{ parameters.poolName }}
+    queueName: ${{ parameters.queueName }}
+    timeout: ${{ parameters.timeout }}
+    configuration: Release
+    testRuns:
+      - oop64bit: false
+        oopCoreClr: false
+        lspEditor: false
+        runName: VS_Integration_Release_32
+      - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        - oop64bit: true
+          oopCoreClr: false
           lspEditor: false
-
-  - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-    - job: VS_Integration_Release_64
-      pool:
-        name: ${{ parameters.poolName }}
-        demands: ImageOverride -equals ${{ parameters.queueName }}
-      timeoutInMinutes: ${{ parameters.timeout }}
-      steps:
-        - template: eng/pipelines/test-integration-job.yml
-          parameters:
-            configuration: Release
-            oop64bit: true
-            lspEditor: false
+          runName: VS_Integration_Release_64

eng/build.ps1

@@ -539,8 +539,13 @@ function EnablePreviewSdks() {
 # Deploy our core VSIX libraries to Visual Studio via the Roslyn VSIX tool.  This is an alternative to
 # deploying at build time.
 function Deploy-VsixViaTool() {
-  $vsixDir = Get-PackageDir "RoslynTools.VSIXExpInstaller"
-  $vsixExe = Join-Path $vsixDir "tools\VsixExpInstaller.exe"
+
+  $vsixExe = Join-Path $ArtifactsDir "bin\RunTests\$configuration\net7.0\VSIXExpInstaller\VSIXExpInstaller.exe"
+  Write-Host "VSIX EXE path: " $vsixExe
+  if (-not (Test-Path $vsixExe)) {
+    Write-Host "VSIX EXE not found: '$vsixExe'." -ForegroundColor Red
+    ExitWithExitCode 1
+  }
 
   $vsInfo = LocateVisualStudio
   if ($vsInfo -eq $null) {