AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix OS and GPU driver version for GT610 bots.

Browse Source 
No-Try: true
Change-Id: Ib15ccc492abdab42a215b3b36cbb85453dd94f45
Reviewed-on: https://skia-review.googlesource.com/113669
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2018-03-10 15:21:27 -05:00 committed by Skia Commit-Bot
parent 299b882f20
commit 87122d3809
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
infra/bots/gen_tasks.go
View File

@ -213,9 +213,16 @@ func defaultSwarmDimensions(parts map[string]string) []string {
glog.Fatalf("Entry %q not found in OS mapping.", os)
}
if os == "Win10" && parts["model"] == "Golo" {
// Golo/MTV lab bots have Windows 10 version 1703, whereas Skolo bots have Windows 10 version
// 1709.
d["os"] = "Windows-10-15063"
// ChOps-owned machines have different Windows images than Skolo machines.
d["os"], ok = map[string]string{
// MTV lab bots with Quadro GPU have Windows 10 v1703.
"QuadroP400": "Windows-10-15063",
// Golo bots with GT610 have Windows 10 v1709, but a slightly different version than Skolo.
"GT610": "Windows-10-16299.125",
}[parts["cpu_or_gpu_value"]]
if !ok {
glog.Fatalf("Entry %q not found in Win10 Golo OS mapping.", parts["cpu_or_gpu_value"])
}
}
} else {
d["os"] = DEFAULT_OS_DEBIAN
@ -294,7 +301,7 @@ func defaultSwarmDimensions(parts map[string]string) []string {
} else {
if strings.Contains(parts["os"], "Win") {
gpu, ok := map[string]string{
"GT610": "10de:104a-22.21.13.8205",
"GT610": "10de:104a-23.21.13.8813",
"GTX1070": "10de:1ba1-23.21.13.9101",
"GTX660": "10de:11c0-23.21.13.9101",
"GTX960": "10de:1401-23.21.13.9101",

24
infra/bots/tasks.json
View File

@ -11539,8 +11539,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:10de:104a-22.21.13.8205",
"os:Windows-10-15063",
"gpu:10de:104a-23.21.13.8813",
"os:Windows-10-16299.125",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@ -11586,8 +11586,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:10de:104a-22.21.13.8205",
"os:Windows-10-15063",
"gpu:10de:104a-23.21.13.8813",
"os:Windows-10-16299.125",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@ -11633,8 +11633,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:10de:104a-22.21.13.8205",
"os:Windows-10-15063",
"gpu:10de:104a-23.21.13.8813",
"os:Windows-10-16299.125",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@ -21741,8 +21741,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:10de:104a-22.21.13.8205",
"os:Windows-10-15063",
"gpu:10de:104a-23.21.13.8813",
"os:Windows-10-16299.125",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@ -21789,8 +21789,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:10de:104a-22.21.13.8205",
"os:Windows-10-15063",
"gpu:10de:104a-23.21.13.8813",
"os:Windows-10-16299.125",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,
@ -21837,8 +21837,8 @@
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:10de:104a-22.21.13.8205",
"os:Windows-10-15063",
"gpu:10de:104a-23.21.13.8813",
"os:Windows-10-16299.125",
"pool:Skia"
],
"execution_timeout_ns": 14400000000000,