aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2018-06-20 16:12:16 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-22 17:20:47 +0000
commit418ff4a4e83e1b6234346112b214de0de54660ba (patch)
tree5cc9bc87f4ed5ee9efd1e5899a9b1a77418a2840
parent4a44743a6b5fb0879e95d3dc45d253b0566680fb (diff)
Upgrade MacOS on Skolo bots.
These include MacBook10.1 and MacBookAir7.2. Change-Id: I5d90f0c95a2d0199ec498dda7ad70064bb98aa22 Reviewed-on: https://skia-review.googlesource.com/135328 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
-rw-r--r--infra/bots/gen_tasks.go4
-rw-r--r--infra/bots/tasks.json26
2 files changed, 17 insertions, 13 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 1963b20e18..0122603633 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -436,6 +436,10 @@ func defaultSwarmDimensions(parts map[string]string) []string {
// TODO(dogben): Temporarily add image dimension during upgrade.
d["image"] = "windows-server-2016-dc-v20180410"
}
+ if d["os"] == DEFAULT_OS_MAC && (parts["model"] == "MacBook10.1" || parts["model"] == "MacBookAir7.2") {
+ // TODO(dogben): Get all Mac bots on the same version.
+ d["os"] = "Mac-10.13.5"
+ }
} else {
d["os"] = DEFAULT_OS_DEBIAN
}
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 3251f3ab71..3e4cac3479 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -28684,7 +28684,7 @@
],
"dimensions": [
"gpu:8086:591e",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -28796,7 +28796,7 @@
],
"dimensions": [
"gpu:8086:591e",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -28908,7 +28908,7 @@
],
"dimensions": [
"gpu:8086:591e",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -29020,7 +29020,7 @@
],
"dimensions": [
"gpu:8086:1626",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -29132,7 +29132,7 @@
],
"dimensions": [
"gpu:8086:1626",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -29244,7 +29244,7 @@
],
"dimensions": [
"gpu:8086:1626",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -54769,7 +54769,7 @@
],
"dimensions": [
"gpu:8086:591e",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -54881,7 +54881,7 @@
],
"dimensions": [
"gpu:8086:591e",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -54993,7 +54993,7 @@
],
"dimensions": [
"gpu:8086:591e",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -55105,7 +55105,7 @@
],
"dimensions": [
"gpu:8086:591e",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -55217,7 +55217,7 @@
],
"dimensions": [
"gpu:8086:1626",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -55329,7 +55329,7 @@
],
"dimensions": [
"gpu:8086:1626",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {
@@ -55441,7 +55441,7 @@
],
"dimensions": [
"gpu:8086:1626",
- "os:Mac-10.13.3",
+ "os:Mac-10.13.5",
"pool:Skia"
],
"env_prefixes": {