Remove Vulkan GalaxyS7 bot

These bots have never worked so we're just waisting cycles on them. The
Pixels have the same GPU and an up to date driver so we're not losing
any test coverage.

BUG=skia:

Change-Id: I339c8191d80843399dd5d31d19f6808b235f6672
Reviewed-on: https://skia-review.googlesource.com/8446
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 44754bd..4a6c81c 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -74,9 +74,7 @@
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
   "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
-  "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
   "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
-  "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
   "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",
@@ -170,9 +168,7 @@
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
   "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android",
-  "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
   "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android",
-  "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
   "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
   "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index f7cd772..83ccea5 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -452,24 +452,12 @@
         "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
       ]
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan"
-      ]
-    },
     "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
         "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ]
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan"
-      ]
-    },
     "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -1028,24 +1016,12 @@
         "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android"
       ]
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan"
-      ]
-    },
     "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
       ]
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan"
-      ]
-    },
     "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -3960,55 +3936,6 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:21"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:35"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
-      ],
-      "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
-        "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-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
@@ -4058,55 +3985,6 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:21"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:35"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
-      ],
-      "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
-        "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-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
@@ -8596,55 +8474,6 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:21"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:35"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
-      ],
-      "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
-        "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",
-      "priority": 0.8
-    },
     "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
@@ -8694,55 +8523,6 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:21"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:35"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
-      ],
-      "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
-        "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",
-      "priority": 0.8
-    },
     "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
       "cipd_packages": [
         {
@@ -13426,36 +13206,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
-      "dependencies": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan"
-      ],
-      "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-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
-        "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"
@@ -14806,36 +14556,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
-      "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan"
-      ],
-      "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-GalaxyS7-GPU-Adreno530-arm64-Debug-Android_Vulkan",
-        "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-GalaxyS7-GPU-Adreno530-arm64-Release-Android": {
       "dependencies": [
         "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android"
@@ -14866,36 +14586,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan": {
-      "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan"
-      ],
-      "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-GalaxyS7-GPU-Adreno530-arm64-Release-Android_Vulkan",
-        "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-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
       "dependencies": [
         "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android"