From b5093bc9ede318fe9fc5d62142dd08da646ff370 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 26 Jul 2018 10:17:02 -0400 Subject: [infra] Add Metal to no_upload. In https://skia-review.googlesource.com/c/skia/+/143107, the Metal tasks were added with a whitelist of one unit test, so there are no Gold results to upload. Gold treats the empty results files as invalid, which generates Trooper alerts. No-Try: true Change-Id: Ifcdfccefb173c5cb970d60da5b7c3a89d6bc15db Reviewed-on: https://skia-review.googlesource.com/143500 Commit-Queue: Stephan Altmueller Reviewed-by: Stephan Altmueller Reviewed-by: Greg Daniel Auto-Submit: Ben Wagner --- infra/bots/cfg.json | 7 +- infra/bots/recipes/test.py | 2 + infra/bots/tasks.json | 202 +-------------------------------------------- 3 files changed, 8 insertions(+), 203 deletions(-) (limited to 'infra') diff --git a/infra/bots/cfg.json b/infra/bots/cfg.json index a4eb77ae76..f5cf335b02 100644 --- a/infra/bots/cfg.json +++ b/infra/bots/cfg.json @@ -6,13 +6,14 @@ "pool": "Skia", "no_upload": [ "ASAN", + "AbandonGpuContext", "Coverage", "MSAN", + "Metal", "OpenCL", + "SKQP", "TSAN", "UBSAN", - "Valgrind", - "AbandonGpuContext", - "SKQP" + "Valgrind" ] } diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index d073f1e21e..994011c75d 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -812,6 +812,8 @@ def dm_flags(api, bot): args.extend(blacklisted) if 'Metal' in bot: + # If we modify the whitelist to include GMs, also update infra/bots/cfg.json + # to remove Metal from no_upload. match = ['GrUploadPixelsTests'] if match: diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index f77b8b5ec6..a08fd37f8a 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -2233,7 +2233,7 @@ }, "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal": { "tasks": [ - "Upload-Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal" + "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal" ] }, "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-MoltenVK_Vulkan": { @@ -2248,7 +2248,7 @@ }, "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal": { "tasks": [ - "Upload-Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal" + "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal" ] }, "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan": { @@ -91097,105 +91097,6 @@ "isolate": "swarm_recipe.isolate", "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" }, - "Upload-Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:b9c4670197dcefd8762d6e509302acd3efc6e303" - }, - { - "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_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal\",\"gs_bucket\":\"skia-infra-gm\",\"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\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-highmem-2", - "os:Debian-9.4", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/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", - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, "Upload-Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-MoltenVK_Vulkan": { "caches": [ { @@ -91394,105 +91295,6 @@ "isolate": "swarm_recipe.isolate", "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" }, - "Upload-Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], - "cipd_packages": [ - { - "name": "infra/tools/luci/kitchen/${platform}", - "path": ".", - "version": "git_revision:546aae39f1fb9dce9add528e2011afa574535ecd" - }, - { - "name": "infra/tools/luci-auth/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c" - }, - { - "name": "infra/tools/luci/vpython/${platform}", - "path": "cipd_bin_packages", - "version": "git_revision:b9c4670197dcefd8762d6e509302acd3efc6e303" - }, - { - "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_dm_results", - "-properties", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal\",\"gs_bucket\":\"skia-infra-gm\",\"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\"}", - "-logdog-annotation-url", - "logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations" - ], - "dependencies": [ - "Housekeeper-PerCommit-BundleRecipes", - "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-highmem-2", - "os:Debian-9.4", - "pool:Skia" - ], - "env_prefixes": { - "PATH": [ - "cipd_bin_packages", - "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "${cache_dir}/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", - "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com" - }, "Upload-Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan": { "caches": [ { -- cgit v1.2.3