[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 <stephana@google.com> Reviewed-by: Stephan Altmueller <stephana@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Auto-Submit: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner
Skia Commit-Bot
parent
01a9128a6f
commit
b5093bc9ed
@ -6,13 +6,14 @@
|
|||||||
"pool": "Skia",
|
"pool": "Skia",
|
||||||
"no_upload": [
|
"no_upload": [
|
||||||
"ASAN",
|
"ASAN",
|
||||||
|
"AbandonGpuContext",
|
||||||
"Coverage",
|
"Coverage",
|
||||||
"MSAN",
|
"MSAN",
|
||||||
|
"Metal",
|
||||||
"OpenCL",
|
"OpenCL",
|
||||||
|
"SKQP",
|
||||||
"TSAN",
|
"TSAN",
|
||||||
"UBSAN",
|
"UBSAN",
|
||||||
"Valgrind",
|
"Valgrind"
|
||||||
"AbandonGpuContext",
|
|
||||||
"SKQP"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -812,6 +812,8 @@ def dm_flags(api, bot):
|
|||||||
args.extend(blacklisted)
|
args.extend(blacklisted)
|
||||||
|
|
||||||
if 'Metal' in bot:
|
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']
|
match = ['GrUploadPixelsTests']
|
||||||
|
|
||||||
if match:
|
if match:
|
||||||
|
|||||||
@ -2233,7 +2233,7 @@
|
|||||||
},
|
},
|
||||||
"Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal": {
|
"Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal": {
|
||||||
"tasks": [
|
"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": {
|
"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": {
|
"Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal": {
|
||||||
"tasks": [
|
"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": {
|
"Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan": {
|
||||||
@ -91097,105 +91097,6 @@
|
|||||||
"isolate": "swarm_recipe.isolate",
|
"isolate": "swarm_recipe.isolate",
|
||||||
"service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
|
"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": {
|
"Upload-Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-MoltenVK_Vulkan": {
|
||||||
"caches": [
|
"caches": [
|
||||||
{
|
{
|
||||||
@ -91394,105 +91295,6 @@
|
|||||||
"isolate": "swarm_recipe.isolate",
|
"isolate": "swarm_recipe.isolate",
|
||||||
"service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
|
"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": {
|
"Upload-Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan": {
|
||||||
"caches": [
|
"caches": [
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user