Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 0897c45

Browse files
echesakovechesakov
authored
[release/3.1] Enable additional CI testing (#28149)
* Enable more CI testing in eng/platform-matrix.yml * Allow gcstress test scenarios with the new queue in eng/platform-matrix.yml * Enable the new queue in R2R pipeline in eng/pipelines/r2r.yml * Enable the new queue in eng/pipelines/corefx*.yml * Replace 'eq' with 'in' in eng/platform-matrix.yml
1 parent 1d4fd4a commit 0897c45

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

‎eng/pipelines/corefx-jitstress.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ jobs:
1616
jobTemplate: build-job.yml
1717
buildConfig: checked
1818
platforms:
19-
# TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
2019
- Linux_arm
2120
- Linux_arm64
2221
- Linux_x64
2322
# TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
2423
- Windows_NT_x64
2524
- Windows_NT_x86
25+
- Windows_NT_arm64
2626

2727
- template: /eng/platform-matrix.yml
2828
parameters:
2929
jobTemplate: test-job.yml
3030
buildConfig: checked
3131
platforms:
32-
# TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
3332
- Linux_arm
3433
- Linux_arm64
3534
- Linux_x64
3635
# TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
3736
- Windows_NT_x64
3837
- Windows_NT_x86
38+
- Windows_NT_arm64
3939
helixQueueGroup: corefx
4040
jobParameters:
4141
testGroup: jitstress

‎eng/pipelines/corefx-jitstress2-jitstressregs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ jobs:
1616
jobTemplate: build-job.yml
1717
buildConfig: checked
1818
platforms:
19-
# TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
2019
- Linux_arm
2120
- Linux_arm64
2221
- Linux_x64
2322
# TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
2423
- Windows_NT_x64
2524
- Windows_NT_x86
25+
- Windows_NT_arm64
2626

2727
- template: /eng/platform-matrix.yml
2828
parameters:
2929
jobTemplate: test-job.yml
3030
buildConfig: checked
3131
platforms:
32-
# TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
3332
- Linux_arm
3433
- Linux_arm64
3534
- Linux_x64
3635
# TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
3736
- Windows_NT_x64
3837
- Windows_NT_x86
38+
- Windows_NT_arm64
3939
helixQueueGroup: corefx
4040
jobParameters:
4141
testGroup: jitstress2-jitstressregs

‎eng/pipelines/corefx-jitstressregs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ jobs:
1616
jobTemplate: build-job.yml
1717
buildConfig: checked
1818
platforms:
19-
# TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
2019
- Linux_arm
2120
- Linux_arm64
2221
- Linux_x64
2322
# TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
2423
- Windows_NT_x64
2524
- Windows_NT_x86
25+
- Windows_NT_arm64
2626

2727
- template: /eng/platform-matrix.yml
2828
parameters:
2929
jobTemplate: test-job.yml
3030
buildConfig: checked
3131
platforms:
32-
# TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
3332
- Linux_arm
3433
- Linux_arm64
3534
- Linux_x64
3635
# TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
3736
- Windows_NT_x64
3837
- Windows_NT_x86
38+
- Windows_NT_arm64
3939
helixQueueGroup: corefx
4040
jobParameters:
4141
testGroup: jitstressregs

‎eng/pipelines/corefx.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ jobs:
1616
jobTemplate: build-job.yml
1717
buildConfig: checked
1818
platforms:
19-
# TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
2019
- Linux_arm
2120
- Linux_arm64
2221
- Linux_x64
2322
# TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
2423
- Windows_NT_x64
2524
- Windows_NT_x86
25+
- Windows_NT_arm64
2626

2727
- template: /eng/platform-matrix.yml
2828
parameters:
2929
jobTemplate: test-job.yml
3030
buildConfig: checked
3131
platforms:
32-
# TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this.
3332
- Linux_arm
3433
- Linux_arm64
3534
- Linux_x64
3635
# TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved
3736
- Windows_NT_x64
3837
- Windows_NT_x86
38+
- Windows_NT_arm64
3939
helixQueueGroup: corefx
4040
jobParameters:
4141
testGroup: outerloop

‎eng/pipelines/r2r.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
- Linux_x64
1414
- Windows_NT_x64
1515
- Windows_NT_x86
16+
- Windows_NT_arm64
1617

1718
- template: /eng/platform-matrix.yml
1819
parameters:
@@ -24,6 +25,7 @@ jobs:
2425
- Linux_x64
2526
- Windows_NT_x64
2627
- Windows_NT_x86
28+
- Windows_NT_arm64
2729
helixQueueGroup: ci
2830
jobParameters:
2931
testGroup: outerloop

‎eng/platform-matrix.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ jobs:
273273

274274
# Windows arm64
275275

276-
- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_arm64'), eq(parameters.platformGroup, 'all')) }}:
276+
- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
277277
- template: ${{ parameters.jobTemplate }}
278278
parameters:
279279
ignoreDependencyOnBuildJobs: ${{ parameters.ignoreDependencyOnBuildJobs }}
@@ -282,7 +282,8 @@ jobs:
282282
osGroup: Windows_NT
283283
osIdentifier: Windows_NT
284284
helixQueues:
285-
# TODO: Consider adding Windows.10.Arm64.Open here if capacity is enough for handling both Windows_NT/arm and Windows_NT/arm64 testing
285+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.helixQueueGroup, 'pr', 'ci', 'corefx')) }}:
286+
- Windows.10.Arm64v8.Open
286287
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
287288
- Windows.10.Arm64
288289
${{ insert }}: ${{ parameters.jobParameters }}

0 commit comments

Comments
 (0)