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

Revert cert dim now that all Mac builders have new cert.

Browse Source 
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>
This commit is contained in:
Ben Wagner 2018-01-10 11:14:52 -05:00 committed by Skia Commit-Bot
parent 54f20e0df6
commit 4c39c0dc03
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infra/bots/gen_tasks.go
View File

@ -371,8 +371,6 @@ func defaultSwarmDimensions(parts map[string]string) []string {
} else if d["os"] == DEFAULT_OS_MAC { } else if d["os"] == DEFAULT_OS_MAC {
// Mac CPU bots. // Mac CPU bots.
d["cpu"] = "x86-64-E5-2697_v2" 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, "-CT_") &&
!strings.Contains(name, "Housekeeper-PerCommit-Isolate") { !strings.Contains(name, "Housekeeper-PerCommit-Isolate") {
compile(b, compileTaskName, compileTaskParts) compile(b, compileTaskName, compileTaskParts)
if (parts["role"] == "Calmbench") { if parts["role"] == "Calmbench" {
compile(b, compileParentName, compileParentParts) 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 return strings.Join(rvParts, s.Sep), nil
} }

12
infra/bots/tasks.json
View File

@ -4557,7 +4557,6 @@
}, },
"Build-Mac-Clang-arm-Debug-iOS": { "Build-Mac-Clang-arm-Debug-iOS": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4581,7 +4580,6 @@
}, },
"Build-Mac-Clang-arm-Release-iOS": { "Build-Mac-Clang-arm-Release-iOS": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4612,7 +4610,6 @@
} }
], ],
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4636,7 +4633,6 @@
}, },
"Build-Mac-Clang-arm64-Debug-iOS": { "Build-Mac-Clang-arm64-Debug-iOS": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4660,7 +4656,6 @@
}, },
"Build-Mac-Clang-arm64-Release-iOS": { "Build-Mac-Clang-arm64-Release-iOS": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4684,7 +4679,6 @@
}, },
"Build-Mac-Clang-x64-Release-iOS": { "Build-Mac-Clang-x64-Release-iOS": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4708,7 +4702,6 @@
}, },
"Build-Mac-Clang-x86_64-Debug": { "Build-Mac-Clang-x86_64-Debug": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4732,7 +4725,6 @@
}, },
"Build-Mac-Clang-x86_64-Debug-CommandBuffer": { "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4756,7 +4748,6 @@
}, },
"Build-Mac-Clang-x86_64-Debug-Metal": { "Build-Mac-Clang-x86_64-Debug-Metal": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4780,7 +4771,6 @@
}, },
"Build-Mac-Clang-x86_64-Release": { "Build-Mac-Clang-x86_64-Release": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4804,7 +4794,6 @@
}, },
"Build-Mac-Clang-x86_64-Release-CommandBuffer": { "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",
@ -4828,7 +4817,6 @@
}, },
"Build-Mac-Clang-x86_64-Release-TSAN": { "Build-Mac-Clang-x86_64-Release-TSAN": {
"dimensions": [ "dimensions": [
"cert:2",
"cpu:x86-64-E5-2697_v2", "cpu:x86-64-E5-2697_v2",
"gpu:none", "gpu:none",
"os:Mac-10.13.2", "os:Mac-10.13.2",