Remove Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android.

BUG=skia:6095

Change-Id: I037aa94b23f22a4a7976b3acaacf25e21464d0f4
Reviewed-on: https://skia-review.googlesource.com/6614
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 52ea9f92ac408a4d8ab6e7b8d8757418ffecf450..4456f17b8f99cf2a5dc7d1709fbd63157a511727 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -126,7 +126,6 @@ var (
                "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
                "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
                "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
-               "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
                "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
                // "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
                "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index c911e939958d5e0ad25dfb85fc14e80549aab13e..8604f7dcad7bc043e10635631f61a580348c1a78 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -530,12 +530,6 @@
         "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android"
-      ]
-    },
     "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -4571,55 +4565,6 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:17"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:31"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android"
-      ],
-      "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-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",
-      "priority": 0.8
-    },
     "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "cipd_packages": [
         {
@@ -12697,35 +12642,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
-      "dependencies": [
-        "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-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-NexusPlayer-CPU-Moorefield-x86-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)"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "dependencies": [
         "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"