diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-02-23 11:17:03 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-23 22:24:06 +0000 |
| commit | b3c90fc51e86e6fa84d95e9af084662cd400b668 (patch) | |
| tree | 770f89777ff4506831d4ab0a9b39a85d85285db9 /infra | |
| parent | f01cea2de9890af62e30a60ccd07e91ae1ba465e (diff) | |
Switch Win10 NUC5i7RYH and NUCD34010WYKH bots to new Windows image.
This affects IntelIris6100 and IntelHD4400.
Change-Id: I95a1eee3169ad6ad3c7873fd40f9f00069d5c0ab
Reviewed-on: https://skia-review.googlesource.com/109807
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/gen_tasks.go | 10 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 34 |
2 files changed, 27 insertions, 17 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index cf3a132a84..0e334acbb7 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -210,6 +210,16 @@ func defaultSwarmDimensions(parts map[string]string) []string { if !ok { glog.Fatalf("Entry %q not found in OS mapping.", os) } + if os == "Win10" { + // Transition to new Win image by model name. + _, ok = map[string]bool{ + "NUC5i7RYH": true, + "NUCD34010WYKH": true, + }[parts["model"]] + if ok { + d["os"] = "Windows-10-16299.248" + } + } } else { d["os"] = DEFAULT_OS_DEBIAN } diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 4bf9ff45dc..5517d5aa3a 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -12045,7 +12045,7 @@ ], "dimensions": [ "gpu:8086:162b-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -12092,7 +12092,7 @@ ], "dimensions": [ "gpu:8086:162b-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -12139,7 +12139,7 @@ ], "dimensions": [ "gpu:8086:162b-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -12186,7 +12186,7 @@ ], "dimensions": [ "gpu:8086:162b-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -12515,7 +12515,7 @@ ], "dimensions": [ "gpu:8086:0a16-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -12562,7 +12562,7 @@ ], "dimensions": [ "gpu:8086:0a16-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -12609,7 +12609,7 @@ ], "dimensions": [ "gpu:8086:0a16-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -12656,7 +12656,7 @@ ], "dimensions": [ "gpu:8086:0a16-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -22306,7 +22306,7 @@ ], "dimensions": [ "cpu:x86-64-i7-5557U", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -22354,7 +22354,7 @@ ], "dimensions": [ "gpu:8086:162b-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -22402,7 +22402,7 @@ ], "dimensions": [ "gpu:8086:162b-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -22450,7 +22450,7 @@ ], "dimensions": [ "gpu:8086:162b-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -22498,7 +22498,7 @@ ], "dimensions": [ "gpu:8086:162b-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -22882,7 +22882,7 @@ ], "dimensions": [ "gpu:8086:0a16-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -22930,7 +22930,7 @@ ], "dimensions": [ "gpu:8086:0a16-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -22978,7 +22978,7 @@ ], "dimensions": [ "gpu:8086:0a16-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -23026,7 +23026,7 @@ ], "dimensions": [ "gpu:8086:0a16-20.19.15.4703", - "os:Windows-10-15063", + "os:Windows-10-16299.248", "pool:Skia" ], "execution_timeout_ns": 14400000000000, |