未验证 提交 783e16b9 编写于 作者: A Andy Gocke 提交者: GitHub

Change Windows build machine affinity to Windows.10.Amd64.ClientRS3.DevEx.Open (#29709) (#30425)

* Change Windows build machine affinity to Windows.10.Amd64.ClientRS3.DevEx.Open

These machines have .NET Framework 4.7.2


(cherry picked from commit 416f5304)
上级 18a2bfc0
......@@ -10,7 +10,7 @@ def branchName = GithubBranchName
// Folder that the project jobs reside in (project/branch)
def projectFoldername = Utilities.getFolderName(projectName) + '/' + Utilities.getFolderName(branchName)
def windowsUnitTestMachine = 'win2016-base'
def windowsUnitTestMachine = 'Windows.10.Amd64.ClientRS3.DevEx.Open'
static void addRoslynJob(def myJob, String jobName, String branchName, Boolean isPr, String triggerPhraseExtra, Boolean triggerPhraseOnly = false) {
def archiveSettings = new ArchivalSettings()
......@@ -73,7 +73,7 @@ commitPullList.each { isPr ->
def triggerPhraseOnly = false
def triggerPhraseExtra = ""
Utilities.setMachineAffinity(myJob, 'Windows_NT', windowsUnitTestMachine)
Utilities.setMachineAffinity(myJob, windowsUnitTestMachine)
Utilities.addXUnitDotNETResults(myJob, '**/xUnitResults/*.xml')
addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
}
......@@ -110,7 +110,7 @@ commitPullList.each { isPr ->
def triggerPhraseOnly = false
def triggerPhraseExtra = ""
Utilities.setMachineAffinity(myJob, 'Windows_NT', windowsUnitTestMachine)
Utilities.setMachineAffinity(myJob, windowsUnitTestMachine)
Utilities.addXUnitDotNETResults(myJob, '**/xUnitResults/*.xml')
addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
}
......@@ -179,7 +179,7 @@ commitPullList.each { isPr ->
def triggerPhraseOnly = false
def triggerPhraseExtra = "determinism"
Utilities.setMachineAffinity(myJob, 'Windows_NT', windowsUnitTestMachine)
Utilities.setMachineAffinity(myJob, windowsUnitTestMachine)
addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
}
......@@ -195,7 +195,7 @@ commitPullList.each { isPr ->
def triggerPhraseOnly = false
def triggerPhraseExtra = ""
Utilities.setMachineAffinity(myJob, 'Windows_NT', windowsUnitTestMachine)
Utilities.setMachineAffinity(myJob, windowsUnitTestMachine)
addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
}
......@@ -211,7 +211,7 @@ commitPullList.each { isPr ->
def triggerPhraseOnly = false
def triggerPhraseExtra = "microbuild"
Utilities.setMachineAffinity(myJob, 'Windows_NT', windowsUnitTestMachine)
Utilities.setMachineAffinity(myJob, windowsUnitTestMachine)
addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
}
......@@ -253,7 +253,7 @@ commitPullList.each { isPr ->
// Run it automatically on CI builds but only when requested on PR builds.
def triggerPhraseOnly = isPr
def triggerPhraseExtra = "loc"
Utilities.setMachineAffinity(myJob, 'Windows_NT', windowsUnitTestMachine)
Utilities.setMachineAffinity(myJob, windowsUnitTestMachine)
addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
}
}
......@@ -275,7 +275,7 @@ commitPullList.each { isPr ->
def triggerPhraseOnly = false
def triggerPhraseExtra = "loc changes"
Utilities.setMachineAffinity(myJob, 'Windows_NT', windowsUnitTestMachine)
Utilities.setMachineAffinity(myJob, windowsUnitTestMachine)
addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册