Skip to content

Reduce Azure SQL test scope in PR pipelines #4609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
saurabh500 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Reduce Azure SQL test scope in PR pipelines #4609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a343eb
Limit Azure SQL PR test coverage
saurabh500 Aug 28, 2026
ae2b959
Fix PR manual test filter quoting
saurabh500 Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions eng/pipelines/common/templates/jobs/ci-run-tests-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ parameters:
- name: jobDisplayName
type: string

# VSTest expressions used for regular and quarantined manual-test runs.
- name: manualTestFilters
type: string
default: 'category!=failing&category!=flaky&category!=interactive'

@paulmedynski paulmedynski Sep 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're trying to avoid parameter defaults, and pushing them up the template chain as high as possible. The coalesce()s in ci-run-tests-stage seem like the correct place to keep these values.


- name: flakyManualTestFilters
type: string
default: 'category=flaky'

# The name of the SqlClient pipeline artifacts to download.
- name: mdsArtifactsName
type: string
Expand Down Expand Up @@ -358,6 +367,8 @@ jobs:
operatingSystem: ${{ parameters.operatingSystem }}
packageVersion: ${{ parameters.packageVersion }}
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
manualTestFilters: ${{ parameters.manualTestFilters }}
flakyManualTestFilters: ${{ parameters.flakyManualTestFilters }}

- ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
- template: /eng/pipelines/common/templates/steps/run-all-tests-step.yml@self
Expand All @@ -372,6 +383,8 @@ jobs:
operatingSystem: ${{ parameters.operatingSystem }}
packageVersion: ${{ parameters.packageVersion }}
sqlServerPackageVersion: ${{ parameters.sqlServerPackageVersion }}
manualTestFilters: ${{ parameters.manualTestFilters }}
flakyManualTestFilters: ${{ parameters.flakyManualTestFilters }}

- template: /eng/pipelines/common/templates/steps/publish-test-results-step.yml@self
parameters:
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/common/templates/stages/ci-run-tests-stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ stages:
targetFramework: ${{ targetFramework }}
netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
testSet: ${{ testSet }}
manualTestFilters: ${{ coalesce(config.value.manualTestFilters, 'category!=failing&category!=flaky&category!=interactive') }}

@paulmedynski paulmedynski Sep 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This duplicates the defaults from our C# project files. Should we add a target to build.proj to surface the defaults instead? @benrr101

flakyManualTestFilters: ${{ coalesce(config.value.flakyManualTestFilters, 'category=flaky') }}
configSqlFor: ${{ config.value.configSqlFor }}
operatingSystem: ${{ config.value.operatingSystem }}
saPassword: $(saPassword)
Expand Down Expand Up @@ -155,6 +157,8 @@ stages:
targetFramework: ${{ targetFramework }}
netcoreVersionTestUtils: ${{config.value.netcoreVersionTestUtils }}
testSet: ${{ testSet }}
manualTestFilters: ${{ coalesce(config.value.manualTestFilters, 'category!=failing&category!=flaky&category!=interactive') }}
flakyManualTestFilters: ${{ coalesce(config.value.flakyManualTestFilters, 'category=flaky') }}
configSqlFor: ${{ config.value.configSqlFor }}
operatingSystem: ${{ config.value.operatingSystem }}
saPassword: $(saPassword)
Expand Down
18 changes: 15 additions & 3 deletions eng/pipelines/common/templates/steps/run-all-tests-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ parameters:
type: number
default: 2

# VSTest expressions used for regular and quarantined manual-test runs.
- name: manualTestFilters
type: string
default: 'category!=failing&category!=flaky&category!=interactive'

- name: flakyManualTestFilters
type: string
default: 'category=flaky'

steps:
- ${{ if parameters.debug }}:
- powershell: 'dotnet sdk check'
Expand Down Expand Up @@ -204,6 +213,7 @@ steps:
-p:Configuration=${{ parameters.buildConfiguration }}
-p:PackageVersionSqlClient=${{ parameters.packageVersion }}
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
-p:TestFilters="${{ parameters.manualTestFilters }}"
-p:TestResultsFolderPath=TestResults
${{ else }}: # x86
arguments: >-
Expand All @@ -215,6 +225,7 @@ steps:
-p:PackageVersionSqlClient=${{ parameters.packageVersion }}
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
-p:TestFilters="${{ parameters.manualTestFilters }}"
-p:TestResultsFolderPath=TestResults
retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}

Expand All @@ -233,7 +244,7 @@ steps:
-p:Configuration=${{ parameters.buildConfiguration }}
-p:PackageVersionSqlClient=${{ parameters.packageVersion }}
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
-p:TestFilters="category=flaky"
-p:TestFilters="${{ parameters.flakyManualTestFilters }}"
-p:TestResultsFolderPath=TestResults
-p:TestCodeCoverage=false
${{ else }}: # x86
Expand All @@ -246,7 +257,7 @@ steps:
-p:PackageVersionSqlClient=${{ parameters.packageVersion }}
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
-p:DotnetPath=${{ parameters.dotnetx86RootPath }}
-p:TestFilters="category=flaky"
-p:TestFilters="${{ parameters.flakyManualTestFilters }}"
-p:TestResultsFolderPath=TestResults
-p:TestCodeCoverage=false
continueOnError: true
Expand Down Expand Up @@ -331,6 +342,7 @@ steps:
-p:Configuration=${{ parameters.buildConfiguration }}
-p:PackageVersionSqlClient=${{ parameters.packageVersion }}
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
-p:TestFilters="${{ parameters.manualTestFilters }}"
-p:TestResultsFolderPath=TestResults
retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}

Expand All @@ -348,7 +360,7 @@ steps:
-p:Configuration=${{ parameters.buildConfiguration }}
-p:PackageVersionSqlClient=${{ parameters.packageVersion }}
-p:PackageVersionSqlServer=${{ parameters.sqlServerPackageVersion }}
-p:TestFilters="category=flaky"
-p:TestFilters="${{ parameters.flakyManualTestFilters }}"
-p:TestResultsFolderPath=TestResults
-p:TestCodeCoverage=false
continueOnError: true
14 changes: 14 additions & 0 deletions eng/pipelines/common/variables/azure-sql-test-filters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#################################################################################
# Licensed to the .NET Foundation under one or more agreements. #
# The .NET Foundation licenses this file to you under the MIT license. #
# See the LICENSE file in the project root for more information. #
#################################################################################

variables:
# Keep Azure SQL PR coverage focused on the connectivity test group and the core BulkCopy suite.
# These tests all belong to manual test set 2.
- name: azureSqlConnectionAndBulkCopyTestsFilter
value: '(FullyQualifiedName~Microsoft.Data.SqlClient.ManualTests.BulkCopy|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.AADConnectionTest|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.ConnectionBehaviorTest|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.ConnectivityTest|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.TcpDefaultForAzureTest)&category!=failing&category!=flaky&category!=interactive'

@paulmedynski paulmedynski Sep 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@David-Engel @cheenamalhotra - Does this filter cover everything we want to test relatedto Azure SQL for PRs?

@David-Engel David-Engel Sep 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Off hand, appears fine to me.


- name: azureSqlConnectionAndBulkCopyFlakyTestsFilter
value: '(FullyQualifiedName~Microsoft.Data.SqlClient.ManualTests.BulkCopy|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.SqlBulkCopyTests|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.AADConnectionTest|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.ConnectionBehaviorTest|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.ConnectivityTest|FullyQualifiedName~Microsoft.Data.SqlClient.ManualTesting.Tests.TcpDefaultForAzureTest)&category=flaky'
28 changes: 25 additions & 3 deletions eng/pipelines/dotnet-sqlclient-ci-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ parameters:
type: boolean
default: true

# If true, Azure SQL manual-test legs run only connectivity and core BulkCopy tests from set 2.
# PR pipelines enable this; scheduled CI retains the full configured test sets.
- name: runFocusedAzureSqlTests
type: boolean
default: false

# If true, run manual tests against legacy SQL Server versions (2016, 2017).
# Enabled for CI pipelines; disabled for PR pipelines to keep validation fast.
- name: runLegacySqlTests
Expand All @@ -111,6 +117,7 @@ parameters:

variables:
- template: /eng/pipelines/libraries/ci-build-variables.yml@self
- template: /eng/pipelines/common/variables/azure-sql-test-filters.yml@self

- name: abstractionsArtifactsName
value: Abstractions.Artifacts
Expand Down Expand Up @@ -488,7 +495,12 @@ stages:
TargetFrameworks: ${{parameters.targetFrameworks }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: ${{parameters.buildPlatforms }}
testSets: ${{parameters.testSets }}
${{ if eq(parameters.runFocusedAzureSqlTests, true) }}:
testSets: [2]
manualTestFilters: $(azureSqlConnectionAndBulkCopyTestsFilter)
flakyManualTestFilters: $(azureSqlConnectionAndBulkCopyFlakyTestsFilter)
${{ else }}:
testSets: ${{parameters.testSets }}
useManagedSNI: ${{parameters.useManagedSNI }}
configSqlFor: azure
operatingSystem: Windows
Expand Down Expand Up @@ -518,7 +530,12 @@ stages:
TargetFrameworks: ${{parameters.targetFrameworks }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: ${{parameters.buildPlatforms }}
testSets: ${{parameters.testSets }}
${{ if eq(parameters.runFocusedAzureSqlTests, true) }}:
testSets: [2]
manualTestFilters: $(azureSqlConnectionAndBulkCopyTestsFilter)
flakyManualTestFilters: $(azureSqlConnectionAndBulkCopyFlakyTestsFilter)
${{ else }}:
testSets: ${{parameters.testSets }}
useManagedSNI: ${{parameters.useManagedSNI }}
configSqlFor: azure
operatingSystem: Windows
Expand Down Expand Up @@ -569,7 +586,12 @@ stages:
TargetFrameworks: ${{parameters.targetFrameworksUnix }}
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
buildPlatforms: [AnyCPU]
testSets: ${{parameters.testSets }}
${{ if eq(parameters.runFocusedAzureSqlTests, true) }}:
testSets: [2]
manualTestFilters: $(azureSqlConnectionAndBulkCopyTestsFilter)
flakyManualTestFilters: $(azureSqlConnectionAndBulkCopyFlakyTestsFilter)
${{ else }}:
testSets: ${{parameters.testSets }}
useManagedSNI: [true]
configSqlFor: azure
operatingSystem: Linux
Expand Down
6 changes: 6 additions & 0 deletions eng/pipelines/pr/jobs/test-sqlclientmanual-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@ parameters:
- name: testSet
type: string

# VSTest expression used to select manual tests.
- name: testFilters
type: string
default: 'category!=failing&category!=flaky&category!=interactive'

# Whether integrated security is supported by this test configuration.
- name: supportsIntegratedSecurity
type: boolean
Expand Down Expand Up @@ -221,6 +226,7 @@ jobs:
-p:BuildNumber='$(Build.BuildNumber)'
-p:BuildSuffix='${{ parameters.buildSuffix }}'
-p:TestFramework=${{ parameters.platformDotnet }}
-p:TestFilters="${{ parameters.testFilters }}"
-p:TestSet=${{ parameters.testSet }}
-p:TestResultsFolderPath=${{ variables.testResultsPath }}

Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/pr/sqlclient-pr-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ parameters:

variables:
- template: /eng/pipelines/common/variables/common-variables.yml@self
- template: /eng/pipelines/common/variables/azure-sql-test-filters.yml@self
- template: /eng/pipelines/pr/variables/pr-variables.yml@self

stages:
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/pr/stages/test-stages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,8 @@ stages:
localDbAppName: ${{ parameters.manualTestLocalDbAppName }}
localDbSharedInstanceName: ${{ parameters.manualTestLocalDbSharedInstanceName }}
supportsIntegratedSecurity: false
testSet: "123"
testFilters: $(azureSqlConnectionAndBulkCopyTestsFilter)
testSet: "2"
userManagedIdentityClientId: ${{ parameters.manualTestUserManagedIdentityClientId }}

# TestSqlClientManual - Localhost Always Encrypted
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ extends:
testJobTimeout: ${{ parameters.testJobTimeout }}
testSets: ${{ parameters.testSets }}
useManagedSNI: ${{ parameters.useManagedSNI }}
# Keep remote Azure SQL validation focused; scheduled CI retains the full test suite.
runFocusedAzureSqlTests: true
# Legacy SQL Server tests (2016/2017) run in CI only, not on PRs.
runLegacySqlTests: false
# Don't run the AE tests in Debug mode; they rarely succeed.
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ extends:
testJobTimeout: ${{ parameters.testJobTimeout }}
testSets: ${{ parameters.testSets }}
useManagedSNI: ${{ parameters.useManagedSNI }}
# Keep remote Azure SQL validation focused; scheduled CI retains the full test suite.
runFocusedAzureSqlTests: true
# Legacy SQL Server tests (2016/2017) run in CI only, not on PRs.
runLegacySqlTests: false
# Don't run the AE tests in Debug mode; they rarely succeed.
Expand Down
Loading