diff --git a/eng/pipelines/corefx-jitstress.yml b/eng/pipelines/corefx-jitstress.yml index 6b05bd9b28b8..5bba5f191e06 100644 --- a/eng/pipelines/corefx-jitstress.yml +++ b/eng/pipelines/corefx-jitstress.yml @@ -16,26 +16,26 @@ jobs: jobTemplate: build-job.yml buildConfig: checked platforms: - # 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. - Linux_arm - Linux_arm64 - Linux_x64 # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 - template: /eng/platform-matrix.yml parameters: jobTemplate: test-job.yml buildConfig: checked platforms: - # 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. - Linux_arm - Linux_arm64 - Linux_x64 # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 helixQueueGroup: corefx jobParameters: testGroup: jitstress diff --git a/eng/pipelines/corefx-jitstress2-jitstressregs.yml b/eng/pipelines/corefx-jitstress2-jitstressregs.yml index 397dca32ab8d..13644a033ed5 100644 --- a/eng/pipelines/corefx-jitstress2-jitstressregs.yml +++ b/eng/pipelines/corefx-jitstress2-jitstressregs.yml @@ -16,26 +16,26 @@ jobs: jobTemplate: build-job.yml buildConfig: checked platforms: - # 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. - Linux_arm - Linux_arm64 - Linux_x64 # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 - template: /eng/platform-matrix.yml parameters: jobTemplate: test-job.yml buildConfig: checked platforms: - # 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. - Linux_arm - Linux_arm64 - Linux_x64 # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 helixQueueGroup: corefx jobParameters: testGroup: jitstress2-jitstressregs diff --git a/eng/pipelines/corefx-jitstressregs.yml b/eng/pipelines/corefx-jitstressregs.yml index 24fd87390297..e1c5300f4140 100644 --- a/eng/pipelines/corefx-jitstressregs.yml +++ b/eng/pipelines/corefx-jitstressregs.yml @@ -16,26 +16,26 @@ jobs: jobTemplate: build-job.yml buildConfig: checked platforms: - # 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. - Linux_arm - Linux_arm64 - Linux_x64 # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 - template: /eng/platform-matrix.yml parameters: jobTemplate: test-job.yml buildConfig: checked platforms: - # 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. - Linux_arm - Linux_arm64 - Linux_x64 # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 helixQueueGroup: corefx jobParameters: testGroup: jitstressregs diff --git a/eng/pipelines/corefx.yml b/eng/pipelines/corefx.yml index 05f2fc7ccebf..b99a9f6928d6 100644 --- a/eng/pipelines/corefx.yml +++ b/eng/pipelines/corefx.yml @@ -16,26 +16,26 @@ jobs: jobTemplate: build-job.yml buildConfig: checked platforms: - # 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. - Linux_arm - Linux_arm64 - Linux_x64 # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 - template: /eng/platform-matrix.yml parameters: jobTemplate: test-job.yml buildConfig: checked platforms: - # 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. - Linux_arm - Linux_arm64 - Linux_x64 # TODO: re-enable Windows_NT_arm when https://github.com/dotnet/corefx/issues/38863 is resolved - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 helixQueueGroup: corefx jobParameters: testGroup: outerloop diff --git a/eng/pipelines/r2r.yml b/eng/pipelines/r2r.yml index 24f1f2ef5fce..ae1d2f2f056f 100644 --- a/eng/pipelines/r2r.yml +++ b/eng/pipelines/r2r.yml @@ -13,6 +13,7 @@ jobs: - Linux_x64 - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 - template: /eng/platform-matrix.yml parameters: @@ -24,6 +25,7 @@ jobs: - Linux_x64 - Windows_NT_x64 - Windows_NT_x86 + - Windows_NT_arm64 helixQueueGroup: ci jobParameters: testGroup: outerloop diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml index 21f25882f5a4..e54f92bdf676 100644 --- a/eng/platform-matrix.yml +++ b/eng/platform-matrix.yml @@ -273,7 +273,7 @@ jobs: # Windows arm64 -- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_arm64'), eq(parameters.platformGroup, 'all')) }}: +- ${{ if or(containsValue(parameters.platforms, 'Windows_NT_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: - template: ${{ parameters.jobTemplate }} parameters: ignoreDependencyOnBuildJobs: ${{ parameters.ignoreDependencyOnBuildJobs }} @@ -282,7 +282,8 @@ jobs: osGroup: Windows_NT osIdentifier: Windows_NT helixQueues: - # TODO: Consider adding Windows.10.Arm64.Open here if capacity is enough for handling both Windows_NT/arm and Windows_NT/arm64 testing + - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.helixQueueGroup, 'pr', 'ci', 'corefx')) }}: + - Windows.10.Arm64v8.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - Windows.10.Arm64 ${{ insert }}: ${{ parameters.jobParameters }}