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

Switch Win builders from Win2k8 to Win2016.

Browse Source 
Bug: skia:7296
Change-Id: Id30df3ed2264679338913f275caa69b8e2278075
Reviewed-on: https://skia-review.googlesource.com/70661
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Ben Wagner 2017-11-14 13:30:04 -05:00 committed by Skia Commit-Bot
parent 62acf69353
commit d3fdcc9271
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
infra/bots/gen_tasks.go
View File

@ -36,7 +36,9 @@ const (
ISOLATE_SVG_NAME = "Housekeeper-PerCommit-IsolateSVG" ISOLATE_SVG_NAME = "Housekeeper-PerCommit-IsolateSVG"
DEFAULT_OS_DEBIAN = "Debian-9.1" DEFAULT_OS_DEBIAN = "Debian-9.1"
DEFAULT_OS_MAC = "Mac-10.12"
DEFAULT_OS_UBUNTU = "Ubuntu-14.04" DEFAULT_OS_UBUNTU = "Ubuntu-14.04"
DEFAULT_OS_WIN = "Windows-2016Server-14393"
// Name prefix for upload jobs. // Name prefix for upload jobs.
PREFIX_UPLOAD = "Upload" PREFIX_UPLOAD = "Upload"
@ -186,14 +188,14 @@ func defaultSwarmDimensions(parts map[string]string) []string {
"Chromecast": "Android", "Chromecast": "Android",
"ChromeOS": "ChromeOS", "ChromeOS": "ChromeOS",
"Debian9": DEFAULT_OS_DEBIAN, "Debian9": DEFAULT_OS_DEBIAN,
"Mac": "Mac-10.12", "Mac": DEFAULT_OS_MAC,
"Ubuntu14": DEFAULT_OS_UBUNTU, "Ubuntu14": DEFAULT_OS_UBUNTU,
"Ubuntu16": "Ubuntu-16.10", "Ubuntu16": "Ubuntu-16.10",
"Ubuntu17": "Ubuntu-17.04", "Ubuntu17": "Ubuntu-17.04",
"Win": "Windows-2008ServerR2-SP1", "Win": DEFAULT_OS_WIN,
"Win10": "Windows-10-15063", "Win10": "Windows-10-15063",
"Win2k8": "Windows-2008ServerR2-SP1", "Win2k8": "Windows-2008ServerR2-SP1",
"Win2016": "Windows-2016Server-14393", "Win2016": DEFAULT_OS_WIN,
"Win7": "Windows-7-SP1", "Win7": "Windows-7-SP1",
"Win8": "Windows-8.1-SP0", "Win8": "Windows-8.1-SP0",
"iOS": "iOS-10.3.1", "iOS": "iOS-10.3.1",
@ -346,11 +348,11 @@ func defaultSwarmDimensions(parts map[string]string) []string {
d["gpu"] = "none" d["gpu"] = "none"
if d["os"] == DEFAULT_OS_DEBIAN { if d["os"] == DEFAULT_OS_DEBIAN {
return linuxGceDimensions() return linuxGceDimensions()
} else if d["os"] == "Windows-2008ServerR2-SP1" { } else if d["os"] == DEFAULT_OS_WIN {
// Windows bots. // Windows CPU bots.
d["cpu"] = "x86-64-Haswell_GCE" d["cpu"] = "x86-64-Haswell_GCE"
} else if d["os"] == "Mac-10.12" { } else if d["os"] == DEFAULT_OS_MAC {
// Mac bots. // Mac CPU bots.
d["cpu"] = "x86-64-E5-2697_v2" d["cpu"] = "x86-64-E5-2697_v2"
} }
} }

36
infra/bots/tasks.json
View File

@ -4995,7 +4995,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5030,7 +5030,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5065,7 +5065,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5105,7 +5105,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5140,7 +5140,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5175,7 +5175,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5215,7 +5215,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5245,7 +5245,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5275,7 +5275,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5305,7 +5305,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5335,7 +5335,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5365,7 +5365,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5395,7 +5395,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5425,7 +5425,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5460,7 +5460,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5490,7 +5490,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5520,7 +5520,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [
@ -5555,7 +5555,7 @@
"dimensions": [ "dimensions": [
"cpu:x86-64-Haswell_GCE", "cpu:x86-64-Haswell_GCE",
"gpu:none", "gpu:none",
"os:Windows-2008ServerR2-SP1", "os:Windows-2016Server-14393",
"pool:Skia" "pool:Skia"
], ],
"extra_args": [ "extra_args": [