diff --git a/infra/bots/cfg.json b/infra/bots/cfg.json index 146fcef2bed4f..46e3ea824e4c2 100644 --- a/infra/bots/cfg.json +++ b/infra/bots/cfg.json @@ -10,7 +10,6 @@ "AbandonGpuContext", "Coverage", "MSAN", - "Metal", "OpenCL", "PathKit", "SKQP", diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal.json index 331c285651eeb..5e2f4e7bb968d 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal.json @@ -478,9 +478,28 @@ "_", ".SRW", "--match", - "CopySurface", - "GrTestingBackendTextureUploadTest", - "GrUploadPixelsTests", + "~^ClearOp$", + "~^DDLSurfaceCharacterizationTest$", + "~^DDLOperatorEqTest$", + "~^DeferredProxyTest$", + "~^GPUMemorySize$", + "~^GrContext_colorTypeSupportedAsImage$", + "~^GrContext_colorTypeSupportedAsSurface$", + "~^GrContext_maxSurfaceSamplesForColorType$", + "~^GrContextFactory_sharedContexts$", + "~^GrPipelineDynamicStateTest$", + "~^GrSurfaceRenderability$", + "~^InitialTextureClear$", + "~^PromiseImageTest$", + "~^ResourceAllocatorTest$", + "~^RGB565TextureTest$", + "~^RGBA4444TextureTest$", + "~^TransferPixelsTest$", + "~^skbug6653$", + "~^SurfaceCreationWithColorSpace_Gpu$", + "~^SurfaceSemaphores$", + "~^VertexAttributeCount$", + "~^WrappedProxyTest$", "--nonativeFonts", "--verbose" ], diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 1d8dea99994f6..1b24f0a2f2720 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -811,18 +811,35 @@ def remove_from_args(arg): # skia:7603 match.append('~^GrMeshTest$') + if 'Metal' in bot: + # skia:8243 + match.append('~^ClearOp$') + match.append('~^DDLSurfaceCharacterizationTest$') + match.append('~^DDLOperatorEqTest$') + match.append('~^DeferredProxyTest$') + match.append('~^GPUMemorySize$') + match.append('~^GrContext_colorTypeSupportedAsImage$') + match.append('~^GrContext_colorTypeSupportedAsSurface$') + match.append('~^GrContext_maxSurfaceSamplesForColorType$') + match.append('~^GrContextFactory_sharedContexts$') + match.append('~^GrPipelineDynamicStateTest$') + match.append('~^GrSurfaceRenderability$') + match.append('~^InitialTextureClear$') + match.append('~^PromiseImageTest$') + match.append('~^ResourceAllocatorTest$') + match.append('~^RGB565TextureTest$') + match.append('~^RGBA4444TextureTest$') + match.append('~^TransferPixelsTest$') + match.append('~^skbug6653$') + match.append('~^SurfaceCreationWithColorSpace_Gpu$') + match.append('~^SurfaceSemaphores$') + match.append('~^VertexAttributeCount$') + match.append('~^WrappedProxyTest$') + if blacklisted: args.append('--blacklist') 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 = [] - match.append('CopySurface') - match.append('GrTestingBackendTextureUploadTest') - match.append('GrUploadPixelsTests') - if match: args.append('--match') args.extend(match) diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 1d283536c9c07..92e0f318212ed 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -2328,7 +2328,7 @@ }, "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal": { "tasks": [ - "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal" + "Upload-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": { @@ -2343,7 +2343,7 @@ }, "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal": { "tasks": [ - "Test-Mac-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal" + "Upload-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": { @@ -94399,6 +94399,105 @@ "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:b6cdec8586c9f8d3d728b1bc0bd4331330ba66fc" + }, + { + "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": [ { @@ -94597,6 +94696,105 @@ "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:b6cdec8586c9f8d3d728b1bc0bd4331330ba66fc" + }, + { + "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": [ {