aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2018-07-27 16:28:43 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-30 11:44:45 +0000
commit78077d153fcb9780ff2e7e8449edf3f7fb021fd2 (patch)
treeda5cfc2991b7fd41842397328d26c8f8df36faa2
parent5d20f8754b92745b10372fdf3b1d5e95f905450a (diff)
Upgrade Test/Perf Mac bots to 10.13.6.
Mac Build tasks are stuck on 10.13.3 due to unresolved issues with building iOS and MoltenVK. Bug: chromium:862292 Change-Id: I4195971a5a027fc502aaea01570e43ec19976055 Reviewed-on: https://skia-review.googlesource.com/142330 Auto-Submit: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Eric Boren <borenet@google.com>
-rw-r--r--infra/bots/gen_tasks.go8
-rw-r--r--infra/bots/tasks.json24
2 files changed, 18 insertions, 14 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index f3458ac53d..8f3c2e2d38 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -435,8 +435,12 @@ func defaultSwarmDimensions(parts map[string]string) []string {
// TODO(dogben): Temporarily add image dimension during upgrade.
d["image"] = "windows-server-2016-dc-v20180710"
}
- if d["os"] == DEFAULT_OS_MAC && (parts["model"] == "MacBook10.1" || parts["model"] == "MacBookAir7.2") {
- // TODO(dogben): Get all Mac bots on the same version.
+ // TODO(dogben): Most Mac bots are on 10.13.6. Mac builders are stuck on
+ // 10.13.3 for now because of unresolved issues with building iOS and
+ // MoltenVK. MacMini7.1 are stuck on 10.13.3 because they run *SAN, which
+ // (currently) needs to have an XCode installed that matches the XCode of
+ // the builder.
+ if d["os"] == DEFAULT_OS_MAC && !(parts["model"] == "MacMini7.1" || parts["role"] == "Build") {
d["os"] = "Mac-10.13.6"
}
} else {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index dcb1102f45..2ecd7fb06b 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -28273,7 +28273,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -28384,7 +28384,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -28495,7 +28495,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -28606,7 +28606,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -28717,7 +28717,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -53849,7 +53849,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -53960,7 +53960,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -54071,7 +54071,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -54182,7 +54182,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -54293,7 +54293,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -54404,7 +54404,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {
@@ -54515,7 +54515,7 @@
],
"dimensions": [
"gpu:1002:6821-4.0.20-3.2.8",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.6",
"pool:Skia"
],
"env_prefixes": {