Move build tasks to MacOS 10.12

BUG=skia:

Change-Id: I5317dde5262ff6e880fa54a660f09205c616f1a4
Reviewed-on: https://skia-review.googlesource.com/9898
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Stephan Altmueller <stephana@google.com>

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index a7353b58d328bcac752100c38af464b3c7293ed2..2c47d69a1462ca7400e029c772911b4df8ca58de 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -242,10 +242,23 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str
                }
        }
 
+       // TODO(stephana): Remove this once all Mac machines are on the same
+       // OS version again. Move the call to swarmDimensions back to the
+       // creation of the TaskSpec struct below.
+       dimensions := swarmDimensions(parts)
+       if strings.Contains(name, "Mac") {
+               for idx, dim := range dimensions {
+                       if strings.HasPrefix(dim, "os") {
+                               dimensions[idx] = "os:Mac-10.12"
+                               break
+                       }
+               }
+       }
+
        // Add the task.
        b.MustAddTask(name, &specs.TaskSpec{
                CipdPackages: pkgs,
-               Dimensions:   swarmDimensions(parts),
+               Dimensions:   dimensions,
                ExtraArgs: []string{
                        "--workdir", "../../..", "swarm_compile",
                        fmt.Sprintf("repository=%s", specs.PLACEHOLDER_REPO),

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index b24f41039446dea0c3fc1a5cbfb4aa62a63a6a40..238fffdc26833f9bec58d6ea064f9e32209e68e2 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1868,7 +1868,7 @@
     "Build-Mac-Clang-arm-Debug-iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1893,7 +1893,7 @@
     "Build-Mac-Clang-arm-Release-iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1925,7 +1925,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1950,7 +1950,7 @@
     "Build-Mac-Clang-arm64-Debug-iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1975,7 +1975,7 @@
     "Build-Mac-Clang-arm64-Release-iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2000,7 +2000,7 @@
     "Build-Mac-Clang-x86_64-Debug": {
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2025,7 +2025,7 @@
     "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2050,7 +2050,7 @@
     "Build-Mac-Clang-x86_64-Release": {
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2075,7 +2075,7 @@
     "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
       "dimensions": [
         "gpu:none",
-        "os:Mac-10.11",
+        "os:Mac-10.12",
         "pool:Skia"
       ],
       "extra_args": [