Switch to updated Mac bots.

Bug: skia:7408
Change-Id: I26273df7871e3ee01e227636421962fcc6251e7d
Reviewed-on: https://skia-review.googlesource.com/88080
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

7 files changed, 97 insertions, 34 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 7c4a80ffb4..06565c842b 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -40,7 +40,7 @@ const (
 
 	DEFAULT_OS_DEBIAN    = "Debian-9.1"
 	DEFAULT_OS_LINUX_GCE = "Debian-9.2"
-	DEFAULT_OS_MAC       = "Mac-10.13.1"
+	DEFAULT_OS_MAC       = "Mac-10.13.2"
 	DEFAULT_OS_UBUNTU    = "Ubuntu-14.04"
 	DEFAULT_OS_WIN       = "Windows-2016Server-14393"
 
@@ -335,6 +335,8 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 					glog.Fatalf("Entry %q not found in Mac GPU mapping.", parts["cpu_or_gpu_value"])
 				}
 				d["gpu"] = gpu
+				// TODO(benjaminwagner): Mac GPU bots haven't been upgraded.
+				d["os"] = "Mac-10.13.1"
 			} else if strings.Contains(parts["os"], "ChromeOS") {
 				version, ok := map[string]string{
 					"MaliT604":           "9901.12.0",
@@ -370,7 +372,7 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 			// Mac CPU bots.
 			d["cpu"] = "x86-64-E5-2697_v2"
 			// skia:7408
-			d["cert"] = "1"
+			d["cert"] = "2"
 		}
 	}
 
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json
new file mode 100644
index 0000000000..a75f13c717
--- /dev/null
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json
@@ -0,0 +1,56 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
+    ],
+    "cwd": "[CUSTOM_/_B_WORK]/skia",
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS"
+    },
+    "infra_step": true,
+    "name": "fetch-gn"
+  },
+  {
+    "cmd": [
+      "[CUSTOM_/_B_WORK]/skia/bin/gn",
+      "gen",
+      "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug",
+      "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"Upstream Testing Provisioning Profile\" target_cpu=\"arm64\" target_os=\"ios\""
+    ],
+    "cwd": "[CUSTOM_/_B_WORK]/skia",
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS"
+    },
+    "name": "gn gen"
+  },
+  {
+    "cmd": [
+      "ninja",
+      "-k",
+      "0",
+      "-C",
+      "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug"
+    ],
+    "cwd": "[CUSTOM_/_B_WORK]/skia",
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS"
+    },
+    "name": "ninja"
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py
index 7597619b33..5f38a437a6 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/infra/bots/recipe_modules/flavor/examples/full.py
@@ -73,6 +73,7 @@ TEST_BUILDERS = [
   'Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths',
   'Build-Debian9-GCC-x86_64-Release-Shared',
   'Build-Mac-Clang-arm64-Debug-Android_Vulkan',
+  'Build-Mac-Clang-arm64-Debug-iOS',
   'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
   'Build-Mac-Clang-x86_64-Debug-Metal',
   'Build-Win-Clang-arm64-Release-Android',
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index 6867d98498..63465517c9 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -157,6 +157,10 @@ with open(sys.argv[1], 'w') as f:
         args['skia_vulkan_sdk'] = '"%s"' % win_vulkan_sdk
     if 'Metal' in extra_tokens:
       args['skia_use_metal'] = 'true'
+    if 'iOS' in extra_tokens:
+      # Bots use Chromium signing cert.
+      args['skia_ios_identity'] = '".*GS9WA.*"'
+      args['skia_ios_profile'] = '"Upstream Testing Provisioning Profile"'
     if 'CheckGeneratedFiles' in extra_tokens:
       args['skia_compile_processors'] = 'true'
     if compiler == 'Clang' and 'Win' in os:
diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json
index 8ed77c4a7c..48a8fd4a9d 100644
--- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json
+++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json
@@ -116,7 +116,7 @@
       "[CUSTOM_/_B_WORK]/skia/bin/gn",
       "gen",
       "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug",
-      "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] target_cpu=\"arm64\" target_os=\"ios\""
+      "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"Upstream Testing Provisioning Profile\" target_cpu=\"arm64\" target_os=\"ios\""
     ],
     "cwd": "[CUSTOM_/_B_WORK]/skia",
     "env": {
diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json
index ed046e467c..f4a82d6d5b 100644
--- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json
+++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json
@@ -116,7 +116,7 @@
       "[CUSTOM_/_B_WORK]/skia/bin/gn",
       "gen",
       "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x64-Release-iOS/Release",
-      "--args=cc=\"clang\" cxx=\"clang++\" is_debug=false target_cpu=\"x64\" target_os=\"ios\""
+      "--args=cc=\"clang\" cxx=\"clang++\" is_debug=false skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"Upstream Testing Provisioning Profile\" target_cpu=\"x64\" target_os=\"ios\""
     ],
     "cwd": "[CUSTOM_/_B_WORK]/skia",
     "env": {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index f1550de370..4e831ea6a0 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -4521,10 +4521,10 @@
     },
     "Build-Mac-Clang-arm-Debug-iOS": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4545,10 +4545,10 @@
     },
     "Build-Mac-Clang-arm-Release-iOS": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4576,10 +4576,10 @@
         }
       ],
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4600,10 +4600,10 @@
     },
     "Build-Mac-Clang-arm64-Debug-iOS": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4624,10 +4624,10 @@
     },
     "Build-Mac-Clang-arm64-Release-iOS": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4648,10 +4648,10 @@
     },
     "Build-Mac-Clang-x64-Release-iOS": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4672,10 +4672,10 @@
     },
     "Build-Mac-Clang-x86_64-Debug": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4696,10 +4696,10 @@
     },
     "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4720,10 +4720,10 @@
     },
     "Build-Mac-Clang-x86_64-Debug-Metal": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4744,10 +4744,10 @@
     },
     "Build-Mac-Clang-x86_64-Release": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4768,10 +4768,10 @@
     },
     "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -4792,10 +4792,10 @@
     },
     "Build-Mac-Clang-x86_64-Release-TSAN": {
       "dimensions": [
-        "cert:1",
+        "cert:2",
         "cpu:x86-64-E5-2697_v2",
         "gpu:none",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "extra_args": [
@@ -8907,7 +8907,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -8954,7 +8954,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17699,7 +17699,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17747,7 +17747,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17795,7 +17795,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -17843,7 +17843,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "os:Mac-10.13.1",
+        "os:Mac-10.13.2",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,