Remove Galaxy J5 bot.

NOTRY=true

Change-Id: I9288e5928a08fc57545866aad1cc8b70f86eed6d
Reviewed-on: https://skia-review.googlesource.com/10801
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 98516f2..4664b0c 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -74,8 +74,6 @@
   "Housekeeper-Weekly-RecreateSKPs",
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
-  "Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android",
-  "Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android",
   "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android",
   "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android",
   "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
@@ -191,8 +189,6 @@
   "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
-  "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android",
-  "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android",
   "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android",
   "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android",
   "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index bd3cdb2..10c1217 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -452,18 +452,6 @@
         "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ]
     },
-    "Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android"
-      ]
-    },
-    "Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android"
-      ]
-    },
     "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -1154,18 +1142,6 @@
         "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ]
     },
-    "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android"
-      ]
-    },
-    "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android"
-      ]
-    },
     "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -4218,106 +4194,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:23"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:42"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
-      ],
-      "dimensions": [
-        "device_os:MMB29M",
-        "device_type:j5xnlte",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-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-GalaxyJ5-GPU-Adreno306-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:23"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:42"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
-      ],
-      "dimensions": [
-        "device_os:MMB29M",
-        "device_type:j5xnlte",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-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-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
       "cipd_packages": [
         {
@@ -10001,106 +9877,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:23"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:42"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
-      ],
-      "dimensions": [
-        "device_os:MMB29M",
-        "device_type:j5xnlte",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyJ5-GPU-Adreno306-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-GalaxyJ5-GPU-Adreno306-arm-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:23"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:42"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:5"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
-      ],
-      "dimensions": [
-        "device_os:MMB29M",
-        "device_type:j5xnlte",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyJ5-GPU-Adreno306-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-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
       "cipd_packages": [
         {
@@ -16038,36 +15814,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android": {
-      "dependencies": [
-        "Perf-Android-Clang-GalaxyJ5-GPU-Adreno306-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-GalaxyJ5-GPU-Adreno306-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-GalaxyS6-GPU-MaliT760-arm64-Release-Android": {
       "dependencies": [
         "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android"
@@ -17688,66 +17434,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android": {
-      "dependencies": [
-        "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-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-GalaxyJ5-GPU-Adreno306-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-GalaxyJ5-GPU-Adreno306-arm-Release-Android": {
-      "dependencies": [
-        "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-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-GalaxyJ5-GPU-Adreno306-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-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
       "dependencies": [
         "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android"