From: Steve MacLean Date: Thu, 6 Dec 2018 23:28:35 +0000 (-0500) Subject: Correct win-arm64 build machine affinity X-Git-Tag: submit/tizen/20210909.063632~11032^2~471 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd3789ec4f5f940b1c2ed66b1b56d51883eb6ffb;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Correct win-arm64 build machine affinity Commit migrated from https://github.com/dotnet/core-setup/commit/f0b854016ffd44a512067ee9c2675377a381f6b8 --- diff --git a/src/installer/netci.groovy b/src/installer/netci.groovy index 8a086c6..9808dc8 100644 --- a/src/installer/netci.groovy +++ b/src/installer/netci.groovy @@ -26,6 +26,21 @@ def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() } +def static setMachineAffinity(def job, def os, def architecture) { + assert os instanceof String + assert architecture instanceof String + + if ((os != 'Windows_NT') || (architecture != 'arm64')) { + Utilities.setMachineAffinity(job, os, 'latest-or-auto') + + return + } + + job.with { + label('Windows.10.Amd64.ClientRS4.DevEx.Open') + } +} + platformList.each { platform -> // Calculate names def (os, architecture, configuration) = platform.tokenize(':') @@ -34,7 +49,6 @@ platformList.each { platform -> def jobName = getBuildJobName(configuration, os, architecture) def buildCommand = ''; def osForGHTrigger = os - def version = "latest-or-auto" def dockerRepository = "microsoft/dotnet-buildtools-prereqs" def dockerContainer = '' def dockerWorkingDirectory = "/src/core-setup" @@ -112,7 +126,7 @@ platformList.each { platform -> } } - Utilities.setMachineAffinity(newJob, os, version) + setMachineAffinity(newJob, os, architecture) Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") if (!(architecture == 'arm' || architecture == 'armel' || architecture == 'arm64')) {