Merge branch 'main' into BumpRazor

Author: JoeRobich

azure-pipelines/test-matrix.yml

@@ -18,19 +18,24 @@ jobs:
     matrix:
       UnitTests:
         npmCommand: test:unit
+        isIntegration: false
       CSharpIntegrationTests:
         npmCommand: test:integration:csharp
+        isIntegration: true
       DevKitTests:
         npmCommand: test:integration:devkit
+        isIntegration: true
       RazorTests:
         npmCommand: test:integration:razor
+        isIntegration: true
   pool: ${{ parameters.pool }}
   ${{ if parameters.containerName }}:
     container: ${{ parameters.containerName }}
   steps:
   - template: /azure-pipelines/test.yml@self
     parameters:
       dotnetVersion: ${{ parameters.dotnetVersion }}
-      installAdditionalLinuxDependencies: true
+      installAdditionalLinuxDependencies: ${{ parameters.installAdditionalLinuxDependencies }}
       npmCommand: $(npmCommand)
-      testVSCodeVersion: ${{ parameters.testVSCodeVersion }}
+      testVSCodeVersion: ${{ parameters.testVSCodeVersion }}
+      isIntegration: $(isIntegration)

azure-pipelines/test.yml

@@ -8,6 +8,8 @@ parameters:
     type: string
   - name: testVSCodeVersion
     type: string
+  - name: isIntegration
+    type: string
 
 steps:
 - checkout: self
@@ -33,13 +35,6 @@ steps:
     DISPLAY: :99.0
     CODE_VERSION: ${{ parameters.testVSCodeVersion }}
 
-- powershell: |
-    $tempPath = [System.IO.Path]::GetTempPath()
-    echo "Temp Path: $tempPath"
-    Get-ChildItem -Path $tempPath -Filter *.cpuprofile | Copy-Item -Destination "$(Build.SourcesDirectory)/out/logs"
-  displayName: 'Copy .cpuprofile files to out/logs'
-  condition: succeededOrFailed()
-
 - task: PublishTestResults@2
   condition: succeededOrFailed()
   displayName: 'Publish Test Results'
@@ -51,16 +46,28 @@ steps:
     mergeTestResults: true
     testRunTitle: $(System.StageDisplayName) $(Agent.JobName) (Attempt $(System.JobAttempt))
 
+- powershell: |
+    Write-Host "##vso[task.setvariable variable=isIntegrationVar;]${{ parameters.isIntegration }}"
+  displayName: 'Set IsIntegration Variable'
+  condition: succeededOrFailed()
+    
+- powershell: |
+    $tempPath = [System.IO.Path]::GetTempPath()
+    echo "Temp Path: $tempPath"
+    Get-ChildItem -Path $tempPath -Filter *.cpuprofile | Copy-Item -Destination "$(Build.SourcesDirectory)/out/logs"
+  displayName: 'Copy .cpuprofile files to out/logs'
+  condition: eq(variables.isIntegrationVar, true)
+
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - task: 1ES.PublishPipelineArtifact@1
-    condition: succeededOrFailed()
+    condition: eq(variables.isIntegrationVar, true)
     displayName: 'Upload integration test logs'
     inputs:
       path: '$(Build.SourcesDirectory)/out/logs'
       artifact: 'Test Logs ($(System.StageDisplayName)-$(Agent.JobName)-$(System.JobAttempt))'
 - ${{ else }}: 
   - task: PublishPipelineArtifact@1
-    condition: succeededOrFailed()
+    condition: eq(variables.isIntegrationVar, true)
     displayName: 'Upload integration test logs'
     inputs:
       targetPath: '$(Build.SourcesDirectory)/out/logs'