Speed up Code Coverage Jobs

eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml

@@ -9,7 +9,7 @@
 # pipeline, and uploads them to CodeCov.
 
 parameters:
-  
+
   # True to include debug steps.
   - name: debug
     type: boolean
@@ -69,7 +69,7 @@ jobs:
           dotnet tool install --global dotnet-coverage
           dotnet tool install --global dotnet-reportgenerator-globaltool
         displayName: Install dotnet tools
-          
+
       - pwsh: |
           Write-Host "Removing leftover coverage files from previous runs..."
           Remove-Item $(netFxDir) -Recurse -Force -ErrorAction SilentlyContinue
@@ -83,6 +83,7 @@ jobs:
           Remove-Item coveragereportNetFx -Recurse -Force -ErrorAction SilentlyContinue
           Remove-Item coveragereportNetCore -Recurse -Force -ErrorAction SilentlyContinue
           Remove-Item coveragereportAddOns -Recurse -Force -ErrorAction SilentlyContinue
+        displayName: Clean up from previous runs
 
       - ${{ each targetFramework in parameters.targetFrameworks }}:
         - task: DownloadPipelineArtifact@2
@@ -113,14 +114,20 @@ jobs:
 
             $files = Get-ChildItem $InputDirectoryPath -Recurse -File -Filter *.coverage
 
-            # echo $files
+            if ($files.Count -eq 0) {
+                Write-Host "No coverage files found in $InputDirectoryPath"
+                return
+            }
+
+            Write-Host "Merging $($files.Count) coverage files from $InputDirectoryPath..."
+
             mkdir $OutputDirectoryName
             $counter=0
 
             $toProcess = @()
 
             foreach ($file in $files) {
-                $toProcess += @{ 
+                $toProcess += @{
                     File = $file.FullName
                     OutputFile = "$OutputDirectoryName\$counter.coveragexml"
                 }
@@ -130,13 +137,13 @@ jobs:
 
             $jobs = @()
             foreach ($file in $toProcess){
-                $jobs += Start-ThreadJob -ScriptBlock { 
+                $jobs += Start-ThreadJob -ScriptBlock {
                     $params = $using:file
-                    & dotnet-coverage merge $($params.File) --output $($params.OutputFile) --output-format xml 
-                } 
+                    & dotnet-coverage merge $($params.File) --output $($params.OutputFile) --output-format xml
+                }
             }
 
-            Write-Host "Merging started..."
+            Write-Host "Merging started with $($jobs.Count) parallel jobs..."
             Wait-Job -Job $jobs
 
             foreach ($job in $jobs) {
@@ -146,7 +153,7 @@ jobs:
 
           MergeFiles -InputDirectoryPath "$(netFxDir)" -OutputDirectoryName "coverageNetFxXml"
           MergeFiles -InputDirectoryPath "$(netCoreDir)" -OutputDirectoryName "coverageNetCoreXml"
-          
+
           Write-Host "Removing original coverage files..."
           Remove-Item $(netFxDir) -Recurse -Force -ErrorAction SilentlyContinue
           Remove-Item $(netCoreDir) -Recurse -Force -ErrorAction SilentlyContinue
@@ -163,15 +170,15 @@ jobs:
 
       - pwsh: |
           $jobs = @()
-          $jobs += Start-ThreadJob -ScriptBlock { 
+          $jobs += Start-ThreadJob -ScriptBlock {
               & reportgenerator "-reports:coverageNetFxXml\*.coveragexml" "-targetdir:coveragereportNetFx" "-reporttypes:Cobertura;" "-assemblyfilters:+microsoft.data.sqlclient.dll" "-sourcedirs:$(Build.SourcesDirectory)\src\Microsoft.Data.SqlClient\netfx\src;$(Build.SourcesDirectory)\src\Microsoft.Data.SqlClient\src" "-classfilters:+Microsoft.Data.*"
           }
 
-          $jobs += Start-ThreadJob -ScriptBlock { 
+          $jobs += Start-ThreadJob -ScriptBlock {
               & reportgenerator "-reports:coverageNetCoreXml\*.coveragexml" "-targetdir:coveragereportNetCore" "-reporttypes:Cobertura;" "-assemblyfilters:+microsoft.data.sqlclient.dll" "-sourcedirs:$(Build.SourcesDirectory)\src\Microsoft.Data.SqlClient\netcore\src;$(Build.SourcesDirectory)\src\Microsoft.Data.SqlClient\src" "-classfilters:+Microsoft.Data.*"
           }
 
-          $jobs += Start-ThreadJob -ScriptBlock { 
+          $jobs += Start-ThreadJob -ScriptBlock {
               & reportgenerator "-reports:coverageNetCoreXml\*.coveragexml" "-targetdir:coveragereportAddOns" "-reporttypes:Cobertura;" "-assemblyfilters:+microsoft.data.sqlclient.alwaysencrypted.azurekeyvaultprovider.dll" "-sourcedirs:$(Build.SourcesDirectory)\src\Microsoft.Data.SqlClient\add-ons\AzureKeyVaultProvider" "-classfilters:+Microsoft.Data.*"
           }
 
@@ -199,16 +206,28 @@ jobs:
       - ${{if eq(parameters.upload, true)}}:
         - pwsh: |
             #download Codecov CLI
-            $ProgressPreference = 'SilentlyContinue' 
+            $ProgressPreference = 'SilentlyContinue'
             Invoke-WebRequest -Uri https://cli.codecov.io/latest/windows/codecov.exe -Outfile codecov.exe
-
-            ./codecov --verbose upload-process --fail-on-error -t $(CODECOV_TOKEN) -f "coveragereportNetFx\Cobertura.xml" -F netfx
-            ./codecov --verbose upload-process --fail-on-error -t $(CODECOV_TOKEN) -f "coveragereportNetCore\Cobertura.xml" -F netcore
-            ./codecov --verbose upload-process --fail-on-error -t $(CODECOV_TOKEN) -f "coveragereportAddOns\Cobertura.xml" -F addons
+
+            # The CodeCov CLI fails if the report files aren't found, so confirm
+            # they exist before uploading.
+            if (Test-Path "coveragereportNetFx\Cobertura.xml")
+            {
+              ./codecov --verbose upload-process --fail-on-error -t $(CODECOV_TOKEN) -f "coveragereportNetFx\Cobertura.xml" -F netfx
+            }
+            if (Test-Path "coveragereportNetCore\Cobertura.xml")
+            {
+              ./codecov --verbose upload-process --fail-on-error -t $(CODECOV_TOKEN) -f "coveragereportNetCore\Cobertura.xml" -F netcore
+            }
+            if (Test-Path "coveragereportAddOns\Cobertura.xml")
+            {
+              ./codecov --verbose upload-process --fail-on-error -t $(CODECOV_TOKEN) -f "coveragereportAddOns\Cobertura.xml" -F addons
+            }
           displayName: Upload to CodeCov
-      
+
       - pwsh: |
           Write-Host "Removing reports..."
           Remove-Item coveragereportNetFx -Recurse -Force -ErrorAction SilentlyContinue
           Remove-Item coveragereportNetCore -Recurse -Force -ErrorAction SilentlyContinue
           Remove-Item coveragereportAddOns -Recurse -Force -ErrorAction SilentlyContinue
+        displayName: Clean up reports

eng/pipelines/common/templates/jobs/ci-run-tests-job.yml

@@ -87,6 +87,19 @@ parameters:
     type: boolean
     default: false
 
+  # The type of tests to run:
+  #
+  #   All         - Run all tests.
+  #   Unit        - Only run tests that do not require external resources.
+  #   Integration - Only run tests that require external resources.
+  #
+  - name: testType
+    type: string
+    values:
+      - All
+      - Unit
+      - Integration
+
 jobs:
 - job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.image, 'unknown_image')) }}
 
@@ -269,6 +282,7 @@ jobs:
         buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: ${{ parameters.buildType }}
         testSet: ${{ parameters.testSet }}
+        testType: ${{ parameters.testType }}
         operatingSystem: ${{ parameters.operatingSystem }}
 
   - ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
@@ -293,6 +307,7 @@ jobs:
         buildConfiguration: ${{ parameters.buildConfiguration }}
         referenceType: ${{ parameters.buildType }}
         testSet: ${{ parameters.testSet }}
+        testType: ${{ parameters.testType }}
         msbuildArchitecture: x86
         dotnetx86RootPath: $(dotnetx86RootPath)
         operatingSystem: ${{ parameters.operatingSystem }}

eng/pipelines/common/templates/stages/ci-run-tests-stage.yml

@@ -39,6 +39,19 @@ parameters:
   - name: testJobTimeout
     type: number
 
+  # The type of tests to run:
+  #
+  #   All         - Run all tests.
+  #   Unit        - Only run tests that do not require external resources.
+  #   Integration - Only run tests that require external resources.
+  #
+  - name: testType
+    type: string
+    values:
+      - All
+      - Unit
+      - Integration
+
 stages:
 - ${{ each config in parameters.testConfigurations }}:
   - ${{ each image in config.value.images }}:
@@ -67,6 +80,7 @@ stages:
                   targetFramework: ${{ targetFramework }}
                   netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
                   testSet: ${{ testSet }}
+                  testType: ${{ parameters.testType }}
                   ${{ each codeCoveTF in config.value.codeCovTargetFrameworks }}:
                     ${{ if eq(codeCoveTF, targetFramework) }}:
                       publishTestResults: true
@@ -99,6 +113,7 @@ stages:
                     targetFramework: ${{ targetFramework }}
                     netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
                     testSet: ${{ testSet }}
+                    testType: ${{ parameters.testType }}
                     ${{ each codeCoveTF in config.value.codeCovTargetFrameworks }}:
                       ${{ if eq(codeCoveTF, targetFramework) }}:
                         publishTestResults: true