From 2a81b0ad514a2196ae7a1904cf3f3b2ef79eebac Mon Sep 17 00:00:00 2001 From: Jarret Shook Date: Tue, 10 Dec 2019 00:21:19 +0100 Subject: [PATCH] Re-enable arm32 windows testing (#642) --- eng/pipelines/common/platform-matrix.yml | 1 + eng/pipelines/coreclr/templates/helix-queues-setup.yml | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 0684003..4852fdb 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -229,6 +229,7 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: Windows_NT archType: arm + platform: Windows_NT_arm jobParameters: stagedBuild: ${{ parameters.stagedBuild }} buildConfig: ${{ parameters.buildConfig }} diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index c6f87e1..efd42bb 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -115,15 +115,12 @@ jobs: # Windows_NT arm - ${{ if eq(parameters.platform, 'Windows_NT_arm') }}: - # NOTE: there are no queues specified for Windows_NT_arm public with helixQueueGroup='pr'. This means that specifying - # Windows_NT_arm for a PR job causes a build, but no test run. If the test build and test runs were separate jobs, - # this could be more explicit (and less subtle). - - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'ci', 'corefx')) }}: + - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'corefx')) }}: - Windows.10.Arm64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - Windows.10.Arm64 - # Windows_NT arm + # Windows_NT arm64 - ${{ if eq(parameters.platform, 'Windows_NT_arm64') }}: # TODO: Consider adding Windows.10.Arm64.Open here if capacity is enough for handling both Windows_NT/arm and Windows_NT/arm64 testing - ${{ if eq(variables['System.TeamProject'], 'internal') }}: -- 2.7.4