Remove Metal Perf bot from MacBook Air
Change-Id: I273baef020e1502f462af2419a57a7a00dc0e6a9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/215680
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 3e963f7..568f081 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -289,7 +289,6 @@
"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All",
"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All",
"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer",
- "Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal",
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN",
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index c34c9f2..86dcc40 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1464,11 +1464,6 @@
],
"trigger": "master"
},
- "Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal": {
- "tasks": [
- "Upload-Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal"
- ]
- },
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
"tasks": [
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All"
@@ -36984,117 +36979,6 @@
"perf"
]
},
- "Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:96f81e737868d43124b4661cf1c325296ca04944"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:39"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:187"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:9"
- }
- ],
- "command": [
- "./kitchen${EXECUTABLE_SUFFIX}",
- "cook",
- "-checkout-dir",
- "recipe_bundle",
- "-mode",
- "swarming",
- "-luci-system-account",
- "system",
- "-cache-dir",
- "cache",
- "-temp-dir",
- "tmp",
- "-known-gerrit-host",
- "android.googlesource.com",
- "-known-gerrit-host",
- "boringssl.googlesource.com",
- "-known-gerrit-host",
- "chromium.googlesource.com",
- "-known-gerrit-host",
- "dart.googlesource.com",
- "-known-gerrit-host",
- "fuchsia.googlesource.com",
- "-known-gerrit-host",
- "go.googlesource.com",
- "-known-gerrit-host",
- "llvm.googlesource.com",
- "-known-gerrit-host",
- "skia.googlesource.com",
- "-known-gerrit-host",
- "webrtc.googlesource.com",
- "-output-result-json",
- "${ISOLATED_OUTDIR}/build_result_filename",
- "-workdir",
- ".",
- "-recipe",
- "perf",
- "-properties",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
- "-logdog-annotation-url",
- "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Build-Mac-Clang-x86_64-Release-Metal"
- ],
- "dimensions": [
- "gpu:8086:1626",
- "os:Mac-10.14.3",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "isolate": "perf_skia_bundled.isolate",
- "max_attempts": 2,
- "outputs": [
- "perf"
- ]
- },
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
"caches": [
{
@@ -89526,106 +89410,6 @@
"max_attempts": 2,
"service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Upload-Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:96f81e737868d43124b4661cf1c325296ca04944"
- },
- {
- "name": "infra/gsutil",
- "path": "cipd_bin_packages",
- "version": "version:4.28"
- }
- ],
- "command": [
- "./kitchen${EXECUTABLE_SUFFIX}",
- "cook",
- "-checkout-dir",
- "recipe_bundle",
- "-mode",
- "swarming",
- "-luci-system-account",
- "system",
- "-cache-dir",
- "cache",
- "-temp-dir",
- "tmp",
- "-known-gerrit-host",
- "android.googlesource.com",
- "-known-gerrit-host",
- "boringssl.googlesource.com",
- "-known-gerrit-host",
- "chromium.googlesource.com",
- "-known-gerrit-host",
- "dart.googlesource.com",
- "-known-gerrit-host",
- "fuchsia.googlesource.com",
- "-known-gerrit-host",
- "go.googlesource.com",
- "-known-gerrit-host",
- "llvm.googlesource.com",
- "-known-gerrit-host",
- "skia.googlesource.com",
- "-known-gerrit-host",
- "webrtc.googlesource.com",
- "-output-result-json",
- "${ISOLATED_OUTDIR}/build_result_filename",
- "-workdir",
- ".",
- "-recipe",
- "upload_nano_results",
- "-properties",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
- "-logdog-annotation-url",
- "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "machine_type:n1-highmem-2",
- "os:Debian-9.8",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 3600000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations"
- },
- "io_timeout_ns": 3600000000000,
- "isolate": "swarm_recipe.isolate",
- "max_attempts": 2,
- "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
- },
"Upload-Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
"caches": [
{