aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2018-01-10 11:14:52 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-11 20:52:18 +0000
commit4c39c0dc03e26fd96ce40a731499d1c3fa6d4a68 (patch)
treef4bfe4562f96d533f050c65dd39b96cc4c58a7e0 /infra/bots
parent54f20e0df694d0428442827bd0534afd579682ce (diff)
Revert cert dim now that all Mac builders have new cert.
Bug: chromium:799625, skia:7408 Change-Id: Ibacb40c8383559d29bfe31dcc68d40b28844853e Reviewed-on: https://skia-review.googlesource.com/92687 Commit-Queue: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Stephan Altmueller <stephana@google.com>
Diffstat (limited to 'infra/bots')
-rw-r--r--infra/bots/gen_tasks.go5
-rw-r--r--infra/bots/tasks.json12
2 files changed, 1 insertions, 16 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index a29d75864d..ef79dd531a 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -371,8 +371,6 @@ func defaultSwarmDimensions(parts map[string]string) []string {
} else if d["os"] == DEFAULT_OS_MAC {
// Mac CPU bots.
d["cpu"] = "x86-64-E5-2697_v2"
- // skia:7408
- d["cert"] = "2"
}
}
@@ -1177,7 +1175,7 @@ func process(b *specs.TasksCfgBuilder, name string) {
!strings.Contains(name, "-CT_") &&
!strings.Contains(name, "Housekeeper-PerCommit-Isolate") {
compile(b, compileTaskName, compileTaskParts)
- if (parts["role"] == "Calmbench") {
+ if parts["role"] == "Calmbench" {
compile(b, compileParentName, compileParentParts)
}
}
@@ -1382,4 +1380,3 @@ func (s *JobNameSchema) MakeJobName(parts map[string]string) (string, error) {
}
return strings.Join(rvParts, s.Sep), nil
}
-
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index b501844558..91df25f71d 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -4557,7 +4557,6 @@
},
"Build-Mac-Clang-arm-Debug-iOS": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4581,7 +4580,6 @@
},
"Build-Mac-Clang-arm-Release-iOS": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4612,7 +4610,6 @@
}
],
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4636,7 +4633,6 @@
},
"Build-Mac-Clang-arm64-Debug-iOS": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4660,7 +4656,6 @@
},
"Build-Mac-Clang-arm64-Release-iOS": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4684,7 +4679,6 @@
},
"Build-Mac-Clang-x64-Release-iOS": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4708,7 +4702,6 @@
},
"Build-Mac-Clang-x86_64-Debug": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4732,7 +4725,6 @@
},
"Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4756,7 +4748,6 @@
},
"Build-Mac-Clang-x86_64-Debug-Metal": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4780,7 +4771,6 @@
},
"Build-Mac-Clang-x86_64-Release": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4804,7 +4794,6 @@
},
"Build-Mac-Clang-x86_64-Release-CommandBuffer": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",
@@ -4828,7 +4817,6 @@
},
"Build-Mac-Clang-x86_64-Release-TSAN": {
"dimensions": [
- "cert:2",
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.2",