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

[infra] Upgrade iOS builders.

Browse Source 
Change-Id: I13f402438825b2251a9149995d5c61b14f2e08a3
Reviewed-on: https://skia-review.googlesource.com/148122
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Ben Wagner 2018-08-20 14:57:24 -04:00 committed by Skia Commit-Bot
parent 7adfd2fe29
commit 6f099b72cf
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infra/bots/gen_tasks.go
View File

@ -314,7 +314,7 @@ func kitchenTask(name, recipe, isolate, serviceAccount string, dimensions []stri
Dependencies: []string{BUNDLE_RECIPES_NAME},
Dimensions: dimensions,
EnvPrefixes: map[string][]string{
"PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
"PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
"VPYTHON_VIRTUALENV_ROOT": []string{"cache/vpython"},
},
ExtraTags: map[string]string{
@ -624,10 +624,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"
if strings.Contains(parts["extra_config"], "iOS") {
// iOS builds held back due to issue 'ERROR: Install failed. Got error "APIInternalError".'
d["os"] = "Mac-10.13.3"
}
}
}

12
infra/bots/tasks.json
View File

@ -12231,7 +12231,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.3",
"os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@ -12363,7 +12363,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.3",
"os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@ -12623,7 +12623,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.3",
"os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@ -12755,7 +12755,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.3",
"os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@ -12887,7 +12887,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.3",
"os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@ -13019,7 +13019,7 @@
"dimensions": [
"cpu:x86-64-E5-2697_v2",
"gpu:none",
"os:Mac-10.13.3",
"os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {