diff options
Diffstat (limited to 'netci.groovy')
| -rwxr-xr-x | netci.groovy | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/netci.groovy b/netci.groovy index 7b191cabf8..2bd49acb4b 100755 --- a/netci.groovy +++ b/netci.groovy @@ -708,7 +708,13 @@ def static setMachineAffinity(def job, def os, def architecture, def options = n def isBuild = options['use_arm64_build_machine'] == true if (isBuild == true) { - Utilities.setMachineAffinity(job, os, 'latest-arm64') + // Current set of machines with private Windows arm64 toolset: + // Utilities.setMachineAffinity(job, os, 'latest-arm64') + // + // New set of machines with public Windows arm64 toolset, coming from Helix: + job.with { + label('Windows.10.Amd64.ClientRS4.DevEx.Open') + } } else { Utilities.setMachineAffinity(job, os, 'arm64-windows_nt') } @@ -2423,10 +2429,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR def buildOpts = '' - if (architecture == 'arm64') { - buildOpts += " toolset_dir C:\\ats2" - } - if (doCoreFxTesting) { buildOpts += ' skiptests' } else { @@ -2453,12 +2455,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR def absoluteFxRoot = "%WORKSPACE%\\_\\fx" def fxBranch = getFxBranch(branch) - def toolsetDirOpt = '' - if (architecture == 'arm64') { - toolsetDirOpt = "-toolset_dir C:\\ats2" - } - - buildCommands += "python -u %WORKSPACE%\\tests\\scripts\\run-corefx-tests.py -arch ${architecture} -ci_arch ${architecture} -build_type ${configuration} -fx_root ${absoluteFxRoot} -fx_branch ${fxBranch} -env_script ${envScriptPath} -no_run_tests ${toolsetDirOpt}" + buildCommands += "python -u %WORKSPACE%\\tests\\scripts\\run-corefx-tests.py -arch ${architecture} -ci_arch ${architecture} -build_type ${configuration} -fx_root ${absoluteFxRoot} -fx_branch ${fxBranch} -env_script ${envScriptPath} -no_run_tests" // Zip up the CoreFx runtime and tests. We don't need the CoreCLR binaries; they have been copied to the CoreFX tree. buildCommands += "powershell -NoProfile -Command \"Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::CreateFromDirectory('${workspaceRelativeFxRootWin}\\bin\\testhost\\netcoreapp-Windows_NT-Release-${architecture}', '${workspaceRelativeFxRootWin}\\fxruntime.zip')\""; |