Remove IntelIris640 jobs.

Gold results for IntelIris640 (Kaby Lake) are nearly identical to
IntelIris540 (Skylake).

Bug: skia:6743
No-Try: true
Change-Id: Ia865216cd10af8c11a893712b8e792947d8fcc31
Reviewed-on: https://skia-review.googlesource.com/19665
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

3 files changed, 1 insertions, 893 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index ce9c99de8a..617b56a8c7 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -184,12 +184,6 @@
   "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
   "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
-  "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug",
-  "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE",
-  "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan",
-  "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release",
-  "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE",
-  "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan",
   "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug",
   "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE",
   "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release",
@@ -340,12 +334,6 @@
   "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
   "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
-  "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug",
-  "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE",
-  "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan",
-  "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release",
-  "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE",
-  "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan",
   "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug",
   "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE",
   "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 040c8423c5..3e96572212 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -434,8 +434,7 @@ def dm_flags(bot):
   if 'Vulkan' in bot and 'IntelIris540' in bot and 'Ubuntu' in bot:
     match.extend(['~VkHeapTests']) # skia:6245
 
-  if ('Vulkan' in bot and ('IntelIris540' in bot or 'IntelIris640' in bot) and
-      'Win' in bot):
+  if 'Vulkan' in bot and 'IntelIris540' in bot and 'Win' in bot:
     # skia:6398
     blacklist(['vk', 'gm', '_', 'aarectmodes'])
     blacklist(['vk', 'gm', '_', 'aaxfermodes'])
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 7ed2d5aab6..13f008d952 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1113,42 +1113,6 @@
         "Upload-Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
       ]
     },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug"
-      ]
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan"
-      ]
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release"
-      ]
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan"
-      ]
-    },
     "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -2050,42 +2014,6 @@
         "Upload-Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
       ]
     },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug"
-      ]
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan"
-      ]
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release"
-      ]
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan"
-      ]
-    },
     "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -8879,288 +8807,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -15565,288 +15211,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:26"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:61"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:5926",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan",
-        "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_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -19196,87 +18560,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release": {
-      "dependencies": [
-        "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-perf"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE": {
-      "dependencies": [
-        "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-perf"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan": {
-      "dependencies": [
-        "Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-perf"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release"
@@ -22301,168 +21584,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug": {
-      "dependencies": [
-        "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug",
-        "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-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE": {
-      "dependencies": [
-        "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-ANGLE",
-        "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-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan": {
-      "dependencies": [
-        "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan",
-        "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-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release": {
-      "dependencies": [
-        "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release",
-        "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-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE": {
-      "dependencies": [
-        "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-ANGLE",
-        "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-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan": {
-      "dependencies": [
-        "Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan",
-        "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-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "dependencies": [
         "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug"