make NativeFonts bots Debug bots

Change-Id: I590b60862891c4232d90f9c6dbd93cb1bedc0672
Reviewed-on: https://skia-review.googlesource.com/69903
Reviewed-by: Ben Wagner <bungeman@google.com>

2 files changed, 140 insertions, 140 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index adb3c2d912..82eb9cb0fb 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -287,7 +287,7 @@
   "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android",
-  "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts",
+  "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts",
   "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android",
   "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android",
   "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android",
@@ -350,6 +350,7 @@
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FAAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FDAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FSAA",
+  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FAAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FDAA",
@@ -361,7 +362,6 @@
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast",
-  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41",
@@ -378,8 +378,8 @@
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All",
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All",
+  "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts",
   "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All",
-  "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts",
   "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN",
   "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All",
   "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer",
@@ -431,7 +431,7 @@
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
-  "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts",
+  "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts",
   "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
@@ -483,9 +483,9 @@
   "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
+  "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
-  "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index e546e15c13..922defc102 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1737,10 +1737,10 @@
         "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android"
       ]
     },
-    "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts": {
+    "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts"
+        "Upload-Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts"
       ]
     },
     "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": {
@@ -2139,6 +2139,12 @@
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FSAA"
       ]
     },
+    "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts"
+      ]
+    },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "priority": 0.8,
       "tasks": [
@@ -2181,12 +2187,6 @@
         "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast"
       ]
     },
-    "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts"
-      ]
-    },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
       "priority": 0.8,
       "tasks": [
@@ -2283,16 +2283,16 @@
         "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All"
       ]
     },
-    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
+    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All"
+        "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts"
       ]
     },
-    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts": {
+    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts"
+        "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All"
       ]
     },
     "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN": {
@@ -2603,10 +2603,10 @@
         "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
-    "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+    "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts"
+        "Upload-Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts"
       ]
     },
     "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
@@ -2915,22 +2915,22 @@
         "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI"
       ]
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All"
+        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts"
       ]
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI"
+        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All"
       ]
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts"
+        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI"
       ]
     },
     "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All": {
@@ -13876,9 +13876,9 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts": {
+    "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts": {
       "dependencies": [
-        "Build-Debian9-Clang-arm64-Release-Android",
+        "Build-Debian9-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
@@ -13897,7 +13897,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts",
+        "buildername=Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16304,6 +16304,53 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:32"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:93"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Debian9-Clang-x86_64-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "os:Debian-9.1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "cipd_packages": [
         {
@@ -17160,53 +17207,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:93"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
       "cipd_packages": [
         {
@@ -17969,7 +17969,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
+    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17988,7 +17988,7 @@
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -18003,7 +18003,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All",
+        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18016,7 +18016,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts": {
+    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -18050,7 +18050,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts",
+        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20543,7 +20543,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+    "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20562,7 +20562,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -20577,7 +20577,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts",
+        "buildername=Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22991,7 +22991,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -23010,7 +23010,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -23025,7 +23025,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -23038,7 +23038,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -23057,7 +23057,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-GDI",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -23072,7 +23072,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -23085,7 +23085,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -23104,7 +23104,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-GDI",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -23119,7 +23119,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -26082,9 +26082,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts": {
+    "Upload-Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts"
+        "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -26097,7 +26097,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts",
+        "buildername=Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Debug-All-Android_NativeFonts",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -27675,6 +27675,33 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+      "dependencies": [
+        "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.1",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "dependencies": [
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
@@ -27829,33 +27856,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts": {
-      "dependencies": [
-        "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-infra-gm"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
       "dependencies": [
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD"
@@ -28234,9 +28234,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
+    "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All"
+        "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28249,7 +28249,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All",
+        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-NativeFonts",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28261,9 +28261,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts": {
+    "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts"
+        "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28276,7 +28276,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts",
+        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29276,9 +29276,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+    "Upload-Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
       "dependencies": [
-        "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts"
+        "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29291,7 +29291,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts",
+        "buildername=Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Debug-All-NativeFonts",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30680,9 +30680,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All"
+        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30695,7 +30695,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30707,9 +30707,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI"
+        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30722,7 +30722,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -30734,9 +30734,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts": {
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
       "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts"
+        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -30749,7 +30749,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",