Upgrade Macs to 10.13.1.

Bug: skia:7203
Change-Id: I741d15eabe502fd4c130e8ab3c3cfb92e3794e43
NoTry: true
Reviewed-on: https://skia-review.googlesource.com/68080
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

6 files changed, 80 insertions, 26 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 0f6116543e..882dd5a281 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -37,7 +37,7 @@ const (
 
 	DEFAULT_OS_DEBIAN    = "Debian-9.1"
 	DEFAULT_OS_LINUX_GCE = "Debian-9.2"
-	DEFAULT_OS_MAC       = "Mac-10.12"
+	DEFAULT_OS_MAC       = "Mac-10.13.1"
 	DEFAULT_OS_UBUNTU    = "Ubuntu-14.04"
 	DEFAULT_OS_WIN       = "Windows-2016Server-14393"
 
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json
index 3fb3d87589..27a887e3cd 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All.json
@@ -329,6 +329,22 @@
       "_",
       "image",
       "gen_platf",
+      "incInterlaced.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "inc1.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "inc0.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "butterfly.gif",
+      "_",
+      "image",
+      "gen_platf",
       "testimgari.jpg",
       "_",
       "image",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json
index d2698952dd..0b1e36676c 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer.json
@@ -331,6 +331,22 @@
       "_",
       "image",
       "gen_platf",
+      "incInterlaced.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "inc1.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "inc0.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "butterfly.gif",
+      "_",
+      "image",
+      "gen_platf",
       "testimgari.jpg",
       "_",
       "image",
diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
index e045e131db..ec23b67c18 100644
--- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
+++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
@@ -792,6 +792,22 @@
       "gen_platf",
       "inc14.png",
       "_",
+      "image",
+      "gen_platf",
+      "incInterlaced.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "inc1.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "inc0.gif",
+      "_",
+      "image",
+      "gen_platf",
+      "butterfly.gif",
+      "_",
       "test",
       "_",
       "GrShape",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index b67c5c5202..637b9cd48c 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -322,6 +322,12 @@ def dm_flags(api, bot):
     blacklist('_ image gen_platf inc13.png')
     blacklist('_ image gen_platf inc14.png')
 
+    # These images fail after Mac 10.13.1 upgrade.
+    blacklist('_ image gen_platf incInterlaced.gif')
+    blacklist('_ image gen_platf inc1.gif')
+    blacklist('_ image gen_platf inc0.gif')
+    blacklist('_ image gen_platf butterfly.gif')
+
   # WIC fails on questionable bmps
   if 'Win' in bot:
     blacklist('_ image gen_platf pal8os2v2.bmp')
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index c7858e37f5..4b0fbebcfc 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -4771,7 +4771,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4794,7 +4794,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4824,7 +4824,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4847,7 +4847,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4870,7 +4870,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4893,7 +4893,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4916,7 +4916,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4939,7 +4939,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4962,7 +4962,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4985,7 +4985,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -5008,7 +5008,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -5031,7 +5031,7 @@
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -8849,7 +8849,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -8896,7 +8896,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -8943,7 +8943,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -8990,7 +8990,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9037,7 +9037,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -18026,7 +18026,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -18073,7 +18073,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -18120,7 +18120,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -18167,7 +18167,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -18214,7 +18214,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -18261,7 +18261,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -18308,7 +18308,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -18355,7 +18355,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac-10.12",
+        "os:Mac-10.13.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,