Remove iHD530 tests.

The iHD530 bot is fairly similar to the IntelIris540 bot, and the only open bug for iHD530 (skia:5792) also occurs for IntelIris540.

NOTRY=true

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

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index b53fe84..38a7927 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -152,8 +152,6 @@
   "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
   "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
   "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-  "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-  "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
   "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug",
   "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE",
   "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan",
@@ -255,8 +253,6 @@
   "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
   "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
   "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-  "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-  "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
   "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug",
   "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE",
   "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index fbbca8d..763eaf8 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -920,18 +920,6 @@
         "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ]
     },
-    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
-      ]
-    },
-    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
-      ]
-    },
     "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -1539,18 +1527,6 @@
         "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ]
     },
-    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
-      ]
-    },
-    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
-      ]
-    },
     "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -7843,106 +7819,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:36"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
-      ],
-      "dimensions": [
-        "gpu:8086:1912",
-        "machine_type:n1-standard-8",
-        "os:Windows-10-14393",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-        "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-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:36"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
-      ],
-      "dimensions": [
-        "gpu:8086:1912",
-        "machine_type:n1-standard-8",
-        "os:Windows-10-14393",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
-        "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-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -12942,106 +12818,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:36"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
-      ],
-      "dimensions": [
-        "gpu:8086:1912",
-        "machine_type:n1-standard-8",
-        "os:Windows-10-14393",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-        "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-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:36"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
-      ],
-      "dimensions": [
-        "gpu:8086:1912",
-        "machine_type:n1-standard-8",
-        "os:Windows-10-14393",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
-        "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-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -14874,36 +14650,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "dependencies": [
-        "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
-        "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-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release"
@@ -17334,66 +17080,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "dependencies": [
-        "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-        "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-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "dependencies": [
-        "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
-        "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-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
       "dependencies": [
         "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug"