aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2017-04-06 09:07:04 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-04-06 14:12:45 +0000
commit25bf350d1096622e10cb9d244705c91ed309f8e6 (patch)
tree5827938cf45afcb062ea55bf5c93384bde721b43
parentbf826af16f5d3f0ae63af057ed534f92f0ac4ae3 (diff)
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>
-rw-r--r--infra/bots/gen_tasks.go1
-rw-r--r--infra/bots/tasks.json20
2 files changed, 10 insertions, 11 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 0301034cbd..ea043eea38 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -183,7 +183,6 @@ func swarmDimensions(parts map[string]string) []string {
// 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 {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index cc6f58534a..bb69778854 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -9794,7 +9794,7 @@
"Build-Win-MSVC-x86-Debug"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -9844,7 +9844,7 @@
"Build-Win-MSVC-x86_64-Debug"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -9894,7 +9894,7 @@
"Build-Win-MSVC-x86_64-Debug-GDI"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -9944,7 +9944,7 @@
"Build-Win-MSVC-x86_64-Release"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -15797,7 +15797,7 @@
"Build-Win-MSVC-x86-Debug"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -15847,7 +15847,7 @@
"Build-Win-MSVC-x86-Release"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -15897,7 +15897,7 @@
"Build-Win-MSVC-x86_64-Debug"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -15947,7 +15947,7 @@
"Build-Win-MSVC-x86_64-Debug-GDI"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -15997,7 +15997,7 @@
"Build-Win-MSVC-x86_64-Release"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
@@ -16047,7 +16047,7 @@
"Build-Win-MSVC-x86_64-Release-GDI"
],
"dimensions": [
- "cpu:x86-64",
+ "cpu:x86-64-avx2",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"