From 40226b46ad5fe7b7ee5098380fe8aef9f2318f45 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 2 May 2017 13:13:13 -0400 Subject: [PATCH] Upgrade Windows 10 to v1703. No-Try: true Change-Id: Ifb8528d889233fa14320b9f665ddcaf2f5fae6fb Reviewed-on: https://skia-review.googlesource.com/15141 Reviewed-by: Ben Wagner Commit-Queue: Ben Wagner --- infra/bots/gen_tasks.go | 2 +- infra/bots/tasks.json | 152 ++++++++++++++++++++++++------------------------ 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index a9e0e74..fdd279c 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -151,7 +151,7 @@ func swarmDimensions(parts map[string]string) []string { "Ubuntu": DEFAULT_OS_LINUX, "Ubuntu16": "Ubuntu-16.10", "Win": "Windows-2008ServerR2-SP1", - "Win10": "Windows-10-14393", + "Win10": "Windows-10-15063", "Win2k8": "Windows-2008ServerR2-SP1", "Win7": "Windows-7-SP1", "Win8": "Windows-8.1-SP0", diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 2441a06..23290a6 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -8379,7 +8379,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8426,7 +8426,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8473,7 +8473,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8520,7 +8520,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8567,7 +8567,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8614,7 +8614,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8708,7 +8708,7 @@ ], "dimensions": [ "gpu:8086:162b", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8755,7 +8755,7 @@ ], "dimensions": [ "gpu:8086:162b", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8802,7 +8802,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8849,7 +8849,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8896,7 +8896,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8943,7 +8943,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -8990,7 +8990,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9037,7 +9037,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9085,7 +9085,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-highcpu-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9133,7 +9133,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-highcpu-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9180,7 +9180,7 @@ ], "dimensions": [ "gpu:8086:0a16", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9227,7 +9227,7 @@ ], "dimensions": [ "gpu:8086:0a16", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9274,7 +9274,7 @@ ], "dimensions": [ "gpu:8086:0a16", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9321,7 +9321,7 @@ ], "dimensions": [ "gpu:8086:0a16", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9368,7 +9368,7 @@ ], "dimensions": [ "gpu:1002:683d", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9415,7 +9415,7 @@ ], "dimensions": [ "gpu:1002:683d", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9462,7 +9462,7 @@ ], "dimensions": [ "gpu:10de:11c0", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9509,7 +9509,7 @@ ], "dimensions": [ "gpu:10de:11c0", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9556,7 +9556,7 @@ ], "dimensions": [ "gpu:10de:11c0", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9603,7 +9603,7 @@ ], "dimensions": [ "gpu:10de:11c0", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9650,7 +9650,7 @@ ], "dimensions": [ "gpu:8086:0412", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9697,7 +9697,7 @@ ], "dimensions": [ "gpu:8086:0412", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9745,7 +9745,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-standard-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9793,7 +9793,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-standard-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9841,7 +9841,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-standard-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9889,7 +9889,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-standard-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9936,7 +9936,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9983,7 +9983,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -10030,7 +10030,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -10077,7 +10077,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -10124,7 +10124,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -10171,7 +10171,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15529,7 +15529,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15576,7 +15576,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15623,7 +15623,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15670,7 +15670,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15717,7 +15717,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15764,7 +15764,7 @@ ], "dimensions": [ "gpu:1002:6646", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15858,7 +15858,7 @@ ], "dimensions": [ "gpu:8086:162b", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15905,7 +15905,7 @@ ], "dimensions": [ "gpu:8086:162b", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15952,7 +15952,7 @@ ], "dimensions": [ "gpu:8086:162b", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -15999,7 +15999,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16046,7 +16046,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16093,7 +16093,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16140,7 +16140,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16187,7 +16187,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16234,7 +16234,7 @@ ], "dimensions": [ "gpu:8086:1926", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16282,7 +16282,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-highcpu-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16330,7 +16330,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-highcpu-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16377,7 +16377,7 @@ ], "dimensions": [ "gpu:8086:0a16", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16424,7 +16424,7 @@ ], "dimensions": [ "gpu:8086:0a16", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16471,7 +16471,7 @@ ], "dimensions": [ "gpu:8086:0a16", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16518,7 +16518,7 @@ ], "dimensions": [ "gpu:8086:0a16", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16565,7 +16565,7 @@ ], "dimensions": [ "gpu:1002:683d", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16612,7 +16612,7 @@ ], "dimensions": [ "gpu:1002:683d", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16659,7 +16659,7 @@ ], "dimensions": [ "gpu:10de:11c0", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16706,7 +16706,7 @@ ], "dimensions": [ "gpu:10de:11c0", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16753,7 +16753,7 @@ ], "dimensions": [ "gpu:10de:11c0", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16800,7 +16800,7 @@ ], "dimensions": [ "gpu:8086:0412", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16847,7 +16847,7 @@ ], "dimensions": [ "gpu:8086:0412", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16895,7 +16895,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-standard-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16943,7 +16943,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-standard-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -16991,7 +16991,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-standard-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17039,7 +17039,7 @@ "dimensions": [ "gpu:10de:1401", "machine_type:n1-standard-8", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17086,7 +17086,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17133,7 +17133,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17180,7 +17180,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17227,7 +17227,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17274,7 +17274,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17321,7 +17321,7 @@ ], "dimensions": [ "gpu:10de:1ba1", - "os:Windows-10-14393", + "os:Windows-10-15063", "pool:Skia" ], "execution_timeout_ns": 14400000000000, -- 2.7.4