Add Braswell bots.

BUG=skia:6324
NOTRY=true

Change-Id: I5c8b1572f839efa0a010e1cec8026c34f72cb92a
Reviewed-on: https://skia-review.googlesource.com/9229
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

diff --git a/infra/bots/gpu_map.json b/infra/bots/gpu_map.json
index 59d89f3..fe75e10 100644 (file)
--- a/infra/bots/gpu_map.json
+++ b/infra/bots/gpu_map.json
@@ -10,5 +10,6 @@
   "iHD530":        "8086:1912",
   "IntelHD4600":   "8086:0412",
   "IntelIris540":  "8086:1926",
-  "IntelIris6100": "8086:162b"
+  "IntelIris6100": "8086:162b",
+  "PentiumN3700":  "8086:22b1"
 }

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 2f67f66..ca5b844 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -133,6 +133,8 @@
   "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
   "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
   "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+  "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug",
+  "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release",
   "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
   "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
   "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
@@ -142,6 +144,8 @@
   "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
   "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+  "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE",
+  "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE",
   "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
   "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
   "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
@@ -239,6 +243,8 @@
   "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
   "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
   "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+  "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug",
+  "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release",
   "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
   "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
   "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
@@ -248,6 +254,8 @@
   "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
   "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+  "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE",
+  "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE",
   "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
   "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
   "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index b5818bd..cfe5c44 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -806,6 +806,18 @@
         "Upload-Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
       ]
     },
+    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug"
+      ]
+    },
+    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release"
+      ]
+    },
     "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
@@ -860,6 +872,18 @@
         "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
+    "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE"
+      ]
+    },
+    "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE"
+      ]
+    },
     "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -1443,6 +1467,18 @@
         "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan"
       ]
     },
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug"
+      ]
+    },
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release"
+      ]
+    },
     "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
@@ -1497,6 +1533,18 @@
         "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
+    "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE"
+      ]
+    },
+    "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE"
+      ]
+    },
     "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -6934,6 +6982,114 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:37"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
+          "version": "version:1"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:22b1",
+        "os:Ubuntu-16.10",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:37"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
+          "version": "version:1"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:8086:22b1",
+        "os:Ubuntu-16.10",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
@@ -7375,6 +7531,104 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:37"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:8086:22b1",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:37"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:8086:22b1",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -12182,7 +12436,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12198,14 +12452,19 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
+          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:104a",
-        "os:Windows-10-10586",
+        "gpu:8086:22b1",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12215,7 +12474,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12231,7 +12490,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12247,14 +12506,19 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
+          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926",
-        "os:Windows-10-14393",
+        "gpu:8086:22b1",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12264,7 +12528,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12280,7 +12544,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12299,11 +12563,109 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926",
-        "os:Windows-10-14393",
+        "gpu:10de:104a",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:37"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:1926",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:37"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:8086:1926",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12623,6 +12985,104 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:37"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:8086:22b1",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:37"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:8086:22b1",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -14798,6 +15258,36 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": {
+      "dependencies": [
+        "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-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-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "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-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
@@ -14948,6 +15438,36 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": {
+      "dependencies": [
+        "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-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-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "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-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
@@ -17048,6 +17568,66 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": {
+      "dependencies": [
+        "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-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-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "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-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": {
+      "dependencies": [
+        "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-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-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "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-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
         "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
@@ -17318,6 +17898,66 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": {
+      "dependencies": [
+        "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-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-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "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-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": {
+      "dependencies": [
+        "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-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-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "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-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
       "dependencies": [
         "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug"