Add MotoG4 bot.

BUG=skia:
NOTRY=true

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

diff --git a/infra/bots/android_map.json b/infra/bots/android_map.json
index 5d30d61..12cc2ce 100644 (file)
--- a/infra/bots/android_map.json
+++ b/infra/bots/android_map.json
@@ -3,6 +3,7 @@
   "GalaxyS7":      ["heroqlteatt", "MMB29M"],
   "GalaxyJ5":      ["j5xnlte",     "MMB29M"],
   "GalaxyTab3":    ["goyawifi",    "JDQ39"],
+  "MotoG4":        ["athene",      "MPJ24.139-64"],
   "NVIDIA_Shield": ["foster",      "MRA58K"],
   "Nexus10":       ["manta",       "LMY49J"],
   "Nexus5":        ["hammerhead",  "M4B30Z"],

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index b44c05f..2f67f66 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -75,6 +75,8 @@
   "Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android",
   "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
   "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
+  "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
+  "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
   "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
@@ -173,6 +175,8 @@
   "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
   "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
   "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
+  "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
+  "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 459cd57..206983f 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -458,6 +458,18 @@
         "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ]
     },
+    "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android"
+      ]
+    },
+    "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android"
+      ]
+    },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -1046,6 +1058,18 @@
         "Upload-Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android"
       ]
     },
+    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android"
+      ]
+    },
+    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android"
+      ]
+    },
     "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -4040,6 +4064,106 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
+      "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-Ubuntu-Clang-arm-Debug-Android"
+      ],
+      "dimensions": [
+        "device_os:MPJ24.139-64",
+        "device_type:athene",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
+        "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-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
+      "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-Ubuntu-Clang-arm-Release-Android"
+      ],
+      "dimensions": [
+        "device_os:MPJ24.139-64",
+        "device_type:athene",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
+        "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
@@ -8885,6 +9009,106 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
+      "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-Ubuntu-Clang-arm-Debug-Android"
+      ],
+      "dimensions": [
+        "device_os:MPJ24.139-64",
+        "device_type:athene",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
+        "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-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
+      "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-Ubuntu-Clang-arm-Release-Android"
+      ],
+      "dimensions": [
+        "device_os:MPJ24.139-64",
+        "device_type:athene",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
+        "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
@@ -13824,6 +14048,36 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
+      "dependencies": [
+        "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
+        "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "dependencies": [
         "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
@@ -15264,6 +15518,66 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
+      "dependencies": [
+        "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
+        "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-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
+      "dependencies": [
+        "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
+        "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-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "dependencies": [
         "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android"