Update Windows to v1803 in Skolo.

Change-Id: I6b19e7851cb9a99725fd80bdfaeec2efab81c524
Reviewed-on: https://skia-review.googlesource.com/132263
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2018-06-05 15:35:16 -04:00 committed by Skia Commit-Bot
parent 3a4a3215f5
commit ece4306025
2 changed files with 91 additions and 91 deletions

View File

@ -402,7 +402,7 @@ func defaultSwarmDimensions(parts map[string]string) []string {
"Ubuntu14": DEFAULT_OS_UBUNTU,
"Ubuntu17": "Ubuntu-17.04",
"Win": DEFAULT_OS_WIN,
"Win10": "Windows-10-16299.371",
"Win10": "Windows-10-17134.81",
"Win2k8": "Windows-2008ServerR2-SP1",
"Win2016": DEFAULT_OS_WIN,
"Win7": "Windows-7-SP1",

View File

@ -31085,7 +31085,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -31197,7 +31197,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -31309,7 +31309,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -31421,7 +31421,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -31533,7 +31533,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -31645,7 +31645,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -33171,7 +33171,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -33283,7 +33283,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -33395,7 +33395,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -33507,7 +33507,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -33619,7 +33619,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -33731,7 +33731,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -33843,7 +33843,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -33955,7 +33955,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34067,7 +34067,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34179,7 +34179,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34291,7 +34291,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34403,7 +34403,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34515,7 +34515,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34627,7 +34627,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34739,7 +34739,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34851,7 +34851,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -34963,7 +34963,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35075,7 +35075,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35187,7 +35187,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35299,7 +35299,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35411,7 +35411,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35523,7 +35523,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35635,7 +35635,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35747,7 +35747,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35859,7 +35859,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -35971,7 +35971,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36084,7 +36084,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36197,7 +36197,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36310,7 +36310,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36423,7 +36423,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36536,7 +36536,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36649,7 +36649,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36761,7 +36761,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36873,7 +36873,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -36985,7 +36985,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -37097,7 +37097,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -37209,7 +37209,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -37321,7 +37321,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -59149,7 +59149,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -59261,7 +59261,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -59373,7 +59373,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -59485,7 +59485,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -59597,7 +59597,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -59709,7 +59709,7 @@
],
"dimensions": [
"gpu:1002:6646-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -61287,7 +61287,7 @@
],
"dimensions": [
"cpu:x86-64-i7-5557U",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -61399,7 +61399,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -61511,7 +61511,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -61623,7 +61623,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -61735,7 +61735,7 @@
],
"dimensions": [
"gpu:8086:162b-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -61847,7 +61847,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -61959,7 +61959,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62071,7 +62071,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62183,7 +62183,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62295,7 +62295,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62407,7 +62407,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62519,7 +62519,7 @@
],
"dimensions": [
"gpu:8086:1926-23.20.16.4982",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62631,7 +62631,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62743,7 +62743,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62855,7 +62855,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -62967,7 +62967,7 @@
],
"dimensions": [
"gpu:8086:0a16-20.19.15.4835",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63079,7 +63079,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63191,7 +63191,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63303,7 +63303,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63415,7 +63415,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63527,7 +63527,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63639,7 +63639,7 @@
],
"dimensions": [
"gpu:10de:11c0-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63751,7 +63751,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63863,7 +63863,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -63975,7 +63975,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64087,7 +64087,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64199,7 +64199,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64311,7 +64311,7 @@
],
"dimensions": [
"gpu:1002:683d-23.20.15033.5003",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64424,7 +64424,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64537,7 +64537,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64650,7 +64650,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64763,7 +64763,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64876,7 +64876,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -64989,7 +64989,7 @@
"dimensions": [
"cpu:x86-64-i7-6700K",
"gpu:10de:1401-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -65101,7 +65101,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -65213,7 +65213,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -65325,7 +65325,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -65437,7 +65437,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -65549,7 +65549,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {
@ -65661,7 +65661,7 @@
],
"dimensions": [
"gpu:10de:1ba1-23.21.13.9101",
"os:Windows-10-16299.371",
"os:Windows-10-17134.81",
"pool:Skia"
],
"env_prefixes": {