Remove redundant jobs.

Replacements added in:
https://skia-review.googlesource.com/c/skia/+/26365
https://skia-review.googlesource.com/c/skia/+/31143

Bug: skia:6881
No-Try: true
Change-Id: I35a212f55b9f2cd1240f2f072321ee118a3feecc
Reviewed-on: https://skia-review.googlesource.com/46306
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

2 files changed, 0 insertions, 590 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index c4ebb25ab4..819f5fdcfa 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -155,8 +155,6 @@
   "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug",
   "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
   "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release",
-  "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
-  "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
   "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
   "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
   "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
@@ -182,8 +180,6 @@
   "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
   "Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug",
   "Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release",
-  "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
-  "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
   "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug",
   "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-ASAN",
   "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-UBSAN_float_cast_overflow",
@@ -334,9 +330,6 @@
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release",
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
-  "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
-  "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
-  "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
   "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
   "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
   "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
@@ -363,9 +356,6 @@
   "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
   "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug",
   "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release",
-  "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
-  "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
-  "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-ASAN",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-UBSAN_float_cast_overflow",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index bc0726b933..d40be87faa 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -944,18 +944,6 @@
         "Upload-Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
-    "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
-      ]
-    },
-    "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext"
-      ]
-    },
     "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -1107,18 +1095,6 @@
         "Upload-Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release"
       ]
     },
-    "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
-      ]
-    },
-    "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
-      ]
-    },
     "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -2019,24 +1995,6 @@
         "Upload-Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD"
       ]
     },
-    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
-      "priority": 0.8,
-      "tasks": [
-        "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind"
-      ]
-    },
-    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
-      "priority": 0.8,
-      "tasks": [
-        "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext"
-      ]
-    },
-    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
-      "priority": 0.8,
-      "tasks": [
-        "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext"
-      ]
-    },
     "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -2195,24 +2153,6 @@
         "Upload-Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release"
       ]
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
-      "priority": 0.8,
-      "tasks": [
-        "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
-      ]
-    },
-    "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
-      "priority": 0.8,
-      "tasks": [
-        "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
-      ]
-    },
-    "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
-      "priority": 0.8,
-      "tasks": [
-        "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-TSAN"
-      ]
-    },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -7664,110 +7604,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:7"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1244-384.59",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "perf_skia_bundled_unix.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:7"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1244-384.59",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "perf_skia_bundled_unix.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -8987,110 +8823,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-Clang-x86_64-Debug-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:104a-384.59",
-        "os:Ubuntu-17.04",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
-        "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": "perf_skia_bundled_unix.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:104a-384.59",
-        "os:Ubuntu-17.04",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
-        "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": "perf_skia_bundled_unix.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -15434,162 +15166,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:7"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1244-384.59",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:7"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1244-384.59",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:7"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-GCC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:1244-384.59",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Debian9-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "test_skia_bundled_unix.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -16832,162 +16408,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-Clang-x86_64-Debug-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:104a-384.59",
-        "os:Ubuntu-17.04",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
-        "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-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:104a-384.59",
-        "os:Ubuntu-17.04",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
-        "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-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:29"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:84"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release-TSAN",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:10de:104a-384.59",
-        "os:Ubuntu-17.04",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
-        "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-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": {
       "cipd_packages": [
         {