Add Nexus5 CPU jobs.

Bug: skia:7381
Change-Id: I4e5446420e38e0a6fdeba6f8f89e0685e5f8ac41
NoTry: true
Reviewed-on: https://skia-review.googlesource.com/82301
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

3 files changed, 252 insertions, 1 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 65d467cb62..5fbba4cc87 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -104,6 +104,8 @@
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan",
   "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-All-Android",
   "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-All-Android",
+  "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android",
+  "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android",
   "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android",
   "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android",
   "Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android",
@@ -285,6 +287,8 @@
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-All-Android_Vulkan",
   "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-All-Android",
   "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-All-Android",
+  "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android",
+  "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android",
   "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android",
   "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android",
   "Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index d9f3373778..2ded184c30 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -479,7 +479,7 @@ def dm_flags(api, bot):
     blacklist(['glmsaa8',   'image', 'gen_codec_gpu', 'abnormal.wbmp'])
     blacklist(['glesmsaa4', 'image', 'gen_codec_gpu', 'abnormal.wbmp'])
 
-  if 'Nexus5' in bot:
+  if 'Nexus5' in bot and 'GPU' in bot:
     # skia:5876
     blacklist(['_', 'gm', '_', 'encode-platform'])
 
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index ee7c0b3360..fca724d63d 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -638,6 +638,18 @@
         "Upload-Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-All-Android"
       ]
     },
+    "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android"
+      ]
+    },
+    "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android"
+      ]
+    },
     "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": {
       "priority": 0.8,
       "tasks": [
@@ -1725,6 +1737,18 @@
         "Upload-Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-All-Android"
       ]
     },
+    "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android"
+      ]
+    },
+    "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android"
+      ]
+    },
     "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": {
       "priority": 0.8,
       "tasks": [
@@ -5985,6 +6009,76 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": {
+      "dependencies": [
+        "Build-Debian9-Clang-arm-Debug-Android",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:M4B30Z_3437181",
+        "device_type:hammerhead",
+        "os:Android",
+        "pool:Skia",
+        "python:2.7.9"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android",
+        "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-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
+      "dependencies": [
+        "Build-Debian9-Clang-arm-Release-Android",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:M4B30Z_3437181",
+        "device_type:hammerhead",
+        "os:Android",
+        "pool:Skia",
+        "python:2.7.9"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android",
+        "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-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": {
       "dependencies": [
         "Build-Debian9-Clang-arm-Debug-Android",
@@ -13699,6 +13793,78 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": {
+      "dependencies": [
+        "Build-Debian9-Clang-arm-Debug-Android",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:M4B30Z_3437181",
+        "device_type:hammerhead",
+        "os:Android",
+        "pool:Skia",
+        "python:2.7.9"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
+        "buildername=Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android",
+        "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-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
+      "dependencies": [
+        "Build-Debian9-Clang-arm-Release-Android",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:M4B30Z_3437181",
+        "device_type:hammerhead",
+        "os:Android",
+        "pool:Skia",
+        "python:2.7.9"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
+        "buildername=Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android",
+        "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-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": {
       "dependencies": [
         "Build-Debian9-Clang-arm-Debug-Android",
@@ -23332,6 +23498,33 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
+      "dependencies": [
+        "Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android",
+        "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-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android": {
       "dependencies": [
         "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android"
@@ -25897,6 +26090,60 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android": {
+      "dependencies": [
+        "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Debug-All-Android",
+        "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-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android": {
+      "dependencies": [
+        "Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Android-Clang-Nexus5-CPU-Snapdragon800-arm-Release-All-Android",
+        "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-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android": {
       "dependencies": [
         "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android"