Skip to content

Commit 6473591

Browse files
Max CharlambCopilot
andcommitted
Filter runtime-diagnostics pipeline to SOS tests only
Add classFilter parameter to runtime-diag-job.yml that passes -classfilter to the diagnostics build script, filtering xunit tests by class name. Set classFilter to SOS for both cDAC and DAC legs, avoiding unrelated EventPipe test failures. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 770e62e commit 6473591

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

eng/pipelines/diagnostics/runtime-diag-job.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ parameters:
3838
disableComponentGovernance: ''
3939
liveRuntimeDir: ''
4040
useCdac: false
41+
classFilter: ''
4142

4243
jobs:
4344
- template: /eng/common/${{ parameters.templatePath }}/job/job.yml
@@ -88,6 +89,7 @@ jobs:
8889
- _TestArgs: '-test'
8990
- _Cross: ''
9091
- _CdacArgs: ''
92+
- _ClassFilterArgs: ''
9193

9294
- _buildScript: $(Build.SourcesDirectory)$(dir)build$(scriptExt)
9395

@@ -103,6 +105,9 @@ jobs:
103105
- ${{ if eq(parameters.useCdac, 'true') }}:
104106
- _CdacArgs: '-useCdac'
105107

108+
- ${{ if ne(parameters.classFilter, '') }}:
109+
- _ClassFilterArgs: '-classfilter ${{ parameters.classFilter }}'
110+
106111
# For testing msrc's and service releases. The RuntimeSourceVersion is either "default" or the service release version to test
107112
- _InternalInstallArgs: ''
108113
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.isCodeQLRun, 'false')) }}:
@@ -200,6 +205,7 @@ jobs:
200205
$(_TestArgs)
201206
$(_Cross)
202207
$(_InternalInstallArgs)
208+
$(_ClassFilterArgs)
203209
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
204210
${{ if eq(parameters.testOnly, 'true') }}:
205211
displayName: Test

eng/pipelines/runtime-diagnostics.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ extends:
104104
jobParameters:
105105
name: cDAC
106106
useCdac: true
107+
classFilter: SOS
107108
isOfficialBuild: ${{ variables.isOfficialBuild }}
108109
liveRuntimeDir: $(Build.SourcesDirectory)/artifacts/runtime
109110
timeoutInMinutes: 360
@@ -156,6 +157,7 @@ extends:
156157
jobParameters:
157158
name: DAC
158159
useCdac: false
160+
classFilter: SOS
159161
isOfficialBuild: ${{ variables.isOfficialBuild }}
160162
liveRuntimeDir: $(Build.SourcesDirectory)/artifacts/runtime
161163
timeoutInMinutes: 360

0 commit comments

Comments
 (0)