Skip to content

Commit 6ac3357

Browse files
dibarbetdibarbet
committed
Use helix job monitor
1 parent 4cfd9ff commit 6ac3357

11 files changed

Lines changed: 78 additions & 498 deletions

File tree

‎.github/instructions/Compiler.instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Roslyn follows a **layered compiler architecture**:
1818
- `src/Compilers/Server/` - `VBCSCompiler` build server
1919
- `src/Dependencies/` - High-performance collections (`PooledObjects`, `Threading`)
2020
- `src/ExpressionEvaluator/` - Debugger expression evaluation (uses special `LexerMode.DebuggerSyntax`)
21-
- `src/Tools/` - Compiler tooling (BuildBoss, format tools, analyzers) and benchmark harnesses; `IdeCoreBenchmarks/BenchmarkDotNet.Directory.Packages.props` supplies the package policy copied beside generated BDN runners
21+
- `src/Tools/` - Compiler tooling (BuildBoss, format tools, analyzers) and benchmark harnesses; `RunTests/` discovers and partitions tests, and its Helix mode submits work for the stage-scoped Arcade Helix Job Monitor rather than waiting locally; `IdeCoreBenchmarks/BenchmarkDotNet.Directory.Packages.props` supplies the package policy copied beside generated BDN runners
2222

2323
### Essential Files for Context
2424
- `src/Compilers/CSharp/Portable/Errors/ErrorCode.cs` - All C# compiler error codes

‎.github/memory/FILE_MAP.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This file is a **top-level map only**. For per-area directory detail, read the m
1818
| `Compilers/` | compiler | C#/VB compilers (`Core`, `CSharp`, `VisualBasic`, `Server`). |
1919
| `Dependencies/` | compiler | High-performance pooled collections & threading. |
2020
| `ExpressionEvaluator/` | compiler | Debugger expression evaluator. |
21-
| `Tools/` | compiler | Compiler tooling (BuildBoss, format tools) and benchmark harnesses. |
21+
| `Tools/` | compiler | Compiler tooling (BuildBoss, format tools), the `RunTests` local/Helix test orchestrator, and benchmark harnesses. |
2222
| `Workspaces/` | ide | Solution/Project/Document model, MSBuild loading, Remote (OOP). |
2323
| `Features/`, `EditorFeatures/` | ide | IDE feature logic and editor integration. |
2424
| `Analyzers/`, `CodeStyle/` | ide | IDE0xxx code-style analyzers & fixes. |

‎azure-pipelines.yml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ stages:
199199
name: 'Managed'
200200
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
201201

202-
- stage: Windows_Debug_Desktop
202+
- stage: Windows_Debug_Tests
203203
dependsOn: Windows_Debug_Build
204204
variables:
205205
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
@@ -216,53 +216,6 @@ stages:
216216
helixApiAccessToken: $(HelixApiAccessToken)
217217
poolParameters: ${{ parameters.windowsPool }}
218218

219-
- stage: Windows_Release_Desktop
220-
dependsOn: Windows_Release_Build
221-
variables:
222-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
223-
- group: DotNet-HelixApi-Access
224-
jobs:
225-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
226-
- template: eng/pipelines/test-windows-job.yml
227-
parameters:
228-
testRunName: 'Test Windows Desktop Release 32'
229-
jobName: Test_Windows_Desktop_Release_32
230-
testArtifactName: Transport_Artifacts_Windows_Release
231-
configuration: Release
232-
testArguments: -testDesktop -testArch x86
233-
helixQueueName: $(HelixWindowsVsQueueName)
234-
helixApiAccessToken: $(HelixApiAccessToken)
235-
poolParameters: ${{ parameters.windowsPool }}
236-
237-
- template: eng/pipelines/test-windows-job.yml
238-
parameters:
239-
testRunName: 'Test Windows Desktop Release 64'
240-
jobName: Test_Windows_Desktop_Release_64
241-
testArtifactName: Transport_Artifacts_Windows_Release
242-
configuration: Release
243-
testArguments: -testDesktop -testArch x64
244-
helixQueueName: $(HelixWindowsVsQueueName)
245-
helixApiAccessToken: $(HelixApiAccessToken)
246-
poolParameters: ${{ parameters.windowsPool }}
247-
248-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
249-
- template: eng/pipelines/test-windows-job.yml
250-
parameters:
251-
testRunName: 'Test Windows Desktop Spanish Release 64'
252-
jobName: Test_Windows_Desktop_Spanish_Release_64
253-
testArtifactName: Transport_Artifacts_Windows_Release
254-
configuration: Release
255-
testArguments: -testDesktop -testArch x64
256-
helixQueueName: $(HelixWindowsSpanishQueueName)
257-
helixApiAccessToken: $(HelixApiAccessToken)
258-
poolParameters: ${{ parameters.windowsPool }}
259-
260-
- stage: Windows_Debug_CoreClr
261-
dependsOn: Windows_Debug_Build
262-
variables:
263-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
264-
- group: DotNet-HelixApi-Access
265-
jobs:
266219
- template: eng/pipelines/test-windows-job.yml
267220
parameters:
268221
testRunName: 'Test Windows CoreClr Debug'
@@ -331,12 +284,51 @@ stages:
331284
helixApiAccessToken: $(HelixApiAccessToken)
332285
poolParameters: ${{ parameters.windowsPool }}
333286

334-
- stage: Windows_Release_CoreClr
287+
- template: /eng/common/core-templates/job/helix-job-monitor.yml
288+
parameters:
289+
helixAccessToken: $(HelixApiAccessToken)
290+
291+
- stage: Windows_Release_Tests
335292
dependsOn: Windows_Release_Build
336293
variables:
337294
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
338295
- group: DotNet-HelixApi-Access
339296
jobs:
297+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
298+
- template: eng/pipelines/test-windows-job.yml
299+
parameters:
300+
testRunName: 'Test Windows Desktop Release 32'
301+
jobName: Test_Windows_Desktop_Release_32
302+
testArtifactName: Transport_Artifacts_Windows_Release
303+
configuration: Release
304+
testArguments: -testDesktop -testArch x86
305+
helixQueueName: $(HelixWindowsVsQueueName)
306+
helixApiAccessToken: $(HelixApiAccessToken)
307+
poolParameters: ${{ parameters.windowsPool }}
308+
309+
- template: eng/pipelines/test-windows-job.yml
310+
parameters:
311+
testRunName: 'Test Windows Desktop Release 64'
312+
jobName: Test_Windows_Desktop_Release_64
313+
testArtifactName: Transport_Artifacts_Windows_Release
314+
configuration: Release
315+
testArguments: -testDesktop -testArch x64
316+
helixQueueName: $(HelixWindowsVsQueueName)
317+
helixApiAccessToken: $(HelixApiAccessToken)
318+
poolParameters: ${{ parameters.windowsPool }}
319+
320+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
321+
- template: eng/pipelines/test-windows-job.yml
322+
parameters:
323+
testRunName: 'Test Windows Desktop Spanish Release 64'
324+
jobName: Test_Windows_Desktop_Spanish_Release_64
325+
testArtifactName: Transport_Artifacts_Windows_Release
326+
configuration: Release
327+
testArguments: -testDesktop -testArch x64
328+
helixQueueName: $(HelixWindowsSpanishQueueName)
329+
helixApiAccessToken: $(HelixApiAccessToken)
330+
poolParameters: ${{ parameters.windowsPool }}
331+
340332
- template: eng/pipelines/test-windows-job.yml
341333
parameters:
342334
testRunName: 'Test Windows CoreClr Release'
@@ -348,6 +340,10 @@ stages:
348340
helixApiAccessToken: $(HelixApiAccessToken)
349341
poolParameters: ${{ parameters.windowsPool }}
350342

343+
- template: /eng/common/core-templates/job/helix-job-monitor.yml
344+
parameters:
345+
helixAccessToken: $(HelixApiAccessToken)
346+
351347
- stage: Unix_Debug_CoreClr
352348
dependsOn: Unix_Build
353349
variables:
@@ -392,6 +388,10 @@ stages:
392388
helixApiAccessToken: $(HelixApiAccessToken)
393389
poolParameters: ${{ parameters.ubuntuPool }}
394390

391+
- template: /eng/common/core-templates/job/helix-job-monitor.yml
392+
parameters:
393+
helixAccessToken: $(HelixApiAccessToken)
394+
395395
- stage: Correctness
396396
dependsOn: []
397397
jobs:

‎dotnet-tools.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
"pwsh"
88
],
99
"rollForward": false
10+
},
11+
"microsoft.dotnet.helix.jobmonitor": {
12+
"version": "11.0.0-beta.26406.12",
13+
"commands": [
14+
"dotnet-helix-job-monitor"
15+
]
1016
}
1117
}
1218
}

‎eng/Version.Details.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ This file should be imported by eng/Versions.props
77
<PropertyGroup>
88
<!-- dotnet-arcade dependencies -->
99
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26406.12</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetHelixJobMonitorPackageVersion>11.0.0-beta.26406.12</MicrosoftDotNetHelixJobMonitorPackageVersion>
1011
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26406.12</MicrosoftDotNetHelixSdkPackageVersion>
1112
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.26406.12</MicrosoftDotNetXliffTasksPackageVersion>
1213
<!-- dotnet-dotnet dependencies -->
@@ -50,6 +51,7 @@ This file should be imported by eng/Versions.props
5051
<PropertyGroup>
5152
<!-- dotnet-arcade dependencies -->
5253
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
54+
<MicrosoftDotNetHelixJobMonitorVersion>$(MicrosoftDotNetHelixJobMonitorPackageVersion)</MicrosoftDotNetHelixJobMonitorVersion>
5355
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
5456
<MicrosoftDotNetXliffTasksVersion>$(MicrosoftDotNetXliffTasksPackageVersion)</MicrosoftDotNetXliffTasksVersion>
5557
<!-- dotnet-dotnet dependencies -->

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,5 +153,9 @@
153153
<Uri>https://github.com/dotnet/roslyn</Uri>
154154
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
155155
</Dependency>
156+
<Dependency Name="Microsoft.DotNet.Helix.JobMonitor" Version="11.0.0-beta.26406.12">
157+
<Uri>https://github.com/dotnet/arcade</Uri>
158+
<Sha>d89b0f58e31eda800074a454cf6f2a699d339b94</Sha>
159+
</Dependency>
156160
</ToolsetDependencies>
157161
</Dependencies>

‎eng/pipelines/test-unix-job.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ jobs:
5151
${{ else }}:
5252
args: --ci --helix --configuration ${{ parameters.configuration }} --helixQueueName ${{ parameters.helixQueueName }} ${{ parameters.testArguments }}
5353
displayName: Test
54-
env:
55-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
56-
5754
- template: publish-logs.yml
5855
parameters:
5956
configuration: ${{ parameters.configuration }}

‎eng/pipelines/test-windows-job.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ jobs:
5151
arguments: -ci -helix -configuration ${{ parameters.configuration }} -helixQueueName ${{ parameters.helixQueueName }} -helixApiAccessToken ${{ parameters.helixApiAccessToken }} ${{ parameters.testArguments }} -collectDumps
5252
${{ else }}:
5353
arguments: -ci -helix -configuration ${{ parameters.configuration }} -helixQueueName ${{ parameters.helixQueueName }} ${{ parameters.testArguments }} -collectDumps
54-
env:
55-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
56-
5754
- template: publish-logs.yml
5855
parameters:
5956
configuration: ${{ parameters.configuration }}

0 commit comments

Comments
 (0)