commit 085bf7cce6d305eef86b0294bfe99c50e2a06d77
author Eric Boren <borenet@google.com> Thu Apr 06 17:32:44 2017 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 06 17:32:56 2017 +0000
tree 06b8ce1fbdaa2f8d90b5af8be22e957f7481313b
parent 14987ebb97f491f1b5bc776252b5ddbf65b8fca0

Revert "Remove CPU dimension for Win GCE bots"

This reverts commit 25bf350d1096622e10cb9d244705c91ed309f8e6.

Reason for revert: Speculatively reverting to see if this unsticks try jobs.

Original change's description:
> Remove CPU dimension for Win GCE bots
> 
> This is mainly to collapse the two groups on the capacity stats page.
> 
> Bug: skia:
> Change-Id: Icc125f6fa773ebf11909b0606bc7958146da5983
> Reviewed-on: https://skia-review.googlesource.com/11417
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
> 

TBR=borenet@google.com,kjlubick@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I52f01f6a915fa0ac4446bd492b9e455a07841ee9
Reviewed-on: https://skia-review.googlesource.com/11484
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

infra/bots/gen_tasks.go

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index ea043ee..0301034 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -183,6 +183,7 @@
 				// AVX2 is not correctly detected on Windows. Fall back on other
 				// dimensions to ensure that we correctly target machines which we know
 				// have AVX2 support.
+				d["cpu"] = "x86-64"
 				d["os"] = "Windows-2008ServerR2-SP1"
 			}
 		} else {

infra/bots/tasks.json

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index bb69778..cc6f585 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -9794,7 +9794,7 @@
         "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -9844,7 +9844,7 @@
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -9894,7 +9894,7 @@
         "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -9944,7 +9944,7 @@
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15797,7 +15797,7 @@
         "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15847,7 +15847,7 @@
         "Build-Win-MSVC-x86-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15897,7 +15897,7 @@
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15947,7 +15947,7 @@
         "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15997,7 +15997,7 @@
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -16047,7 +16047,7 @@
         "Build-Win-MSVC-x86_64-Release-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"