Switch GL+Graphite tests to Metal+Graphite Mac GPU.FYI CI bots
Since GL+Graphite is not supported.
Also remove the associated test suppressions.
And remove extra sharding of Pixel tests - slowness was fixed.
And add Pixel tests on more bots, since the slowness was fixed.
The bots that were switched from GL+Graphite to Metal+Graphite are:
"Mac FYI ASAN (Intel)" (Pixel tests were added)
"Mac FYI Experimental Release (Intel)"
"Mac FYI Experimental Retina Release (AMD)"
"Mac FYI Release (Apple M1)"
"Mac FYI Release (Intel)"
"Mac FYI Retina Release (AMD)"
"Mac FYI Retina Release (Apple M2)"
"Mac V8 FYI Release (Intel)"
These bots were switched from GL+Graphite to GL+Ganesh,
since we still need to keep testing GL,
and we either don't have enough capacity for Metal and GL (like Debug),
or Metal is not supported (like NVIDIA):
"Mac FYI Debug (Intel)" (Pixel tests were added)
"Mac FYI Experimental Retina Release (NVIDIA)" (Pixel tests were added)
"Mac FYI Retina Debug (AMD)" (Pixel tests were added)
"Mac FYI Retina Release (NVIDIA)" (Pixel tests were added)
Bug: 1423574, 1458020, 1469875, 1474611
Change-Id: I3e1173b6c195d51fb5ccaaee155d53af6587e269
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4798439
Reviewed-by: Sunny Sachanandani <[email protected]>
Commit-Queue: Yuly Novikov <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1186133}
diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json
index f623b66a..6b51c6c 100644
--- a/testing/buildbot/chromium.gpu.fyi.json
+++ b/testing/buildbot/chromium.gpu.fyi.json
@@ -8465,14 +8465,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -8501,14 +8501,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_metal_passthrough_ganesh_tests",
+ "name": "context_lost_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -8581,7 +8581,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -8591,7 +8591,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -8625,7 +8625,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -8635,7 +8635,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_metal_passthrough_ganesh_test",
+ "name": "expected_color_pixel_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -8897,6 +8897,51 @@
},
{
"args": [
+ "pixel",
+ "--show-stdout",
+ "--browser=release",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
+ "--dont-restore-color-profile-after-test",
+ "--test-machine-name",
+ "${buildername}",
+ "--jobs=4",
+ "--git-revision=${got_revision}"
+ ],
+ "isolate_name": "telemetry_gpu_integration_test",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "pixel_skia_gold_metal_passthrough_graphite_test",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "cpu": "x86-64",
+ "display_attached": "1",
+ "gpu": "8086:3e9b",
+ "os": "Mac-13.3.1"
+ },
+ "hard_timeout": 1800,
+ "idempotent": false,
+ "io_timeout": 1800,
+ "service_account": "[email protected]"
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+ },
+ {
+ "args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
@@ -8939,14 +8984,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -8975,14 +9020,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_metal_passthrough_ganesh_tests",
+ "name": "screenshot_sync_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -9341,14 +9386,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_gl_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -9377,7 +9422,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -9387,7 +9432,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_gl_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -9524,20 +9569,65 @@
},
{
"args": [
+ "pixel",
+ "--show-stdout",
+ "--browser=debug",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
+ "--dont-restore-color-profile-after-test",
+ "--test-machine-name",
+ "${buildername}",
+ "--jobs=1",
+ "--git-revision=${got_revision}"
+ ],
+ "isolate_name": "telemetry_gpu_integration_test",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "pixel_skia_gold_gl_passthrough_ganesh_test",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "cpu": "x86-64",
+ "display_attached": "1",
+ "gpu": "8086:3e9b",
+ "os": "Mac-13.3.1"
+ },
+ "hard_timeout": 1800,
+ "idempotent": false,
+ "io_timeout": 1800,
+ "service_account": "[email protected]"
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+ },
+ {
+ "args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug",
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_gl_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -9890,14 +9980,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -9927,14 +10017,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_metal_passthrough_ganesh_tests",
+ "name": "context_lost_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -10009,7 +10099,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -10019,7 +10109,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -10054,7 +10144,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -10064,7 +10154,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_metal_passthrough_ganesh_test",
+ "name": "expected_color_pixel_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -10293,7 +10383,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -10304,7 +10394,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_gl_passthrough_graphite_test",
+ "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -10327,8 +10417,7 @@
"hard_timeout": 1800,
"idempotent": false,
"io_timeout": 1800,
- "service_account": "[email protected]",
- "shards": 3
+ "service_account": "[email protected]"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
@@ -10340,7 +10429,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -10351,7 +10440,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
+ "name": "pixel_skia_gold_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -10423,14 +10512,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -10460,14 +10549,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_metal_passthrough_ganesh_tests",
+ "name": "screenshot_sync_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -10998,14 +11087,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -11037,14 +11126,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_metal_passthrough_ganesh_tests",
+ "name": "context_lost_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -11123,7 +11212,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -11133,7 +11222,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -11170,7 +11259,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -11180,7 +11269,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_metal_passthrough_ganesh_test",
+ "name": "expected_color_pixel_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -11421,7 +11510,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -11432,7 +11521,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_gl_passthrough_graphite_test",
+ "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -11457,8 +11546,7 @@
"hard_timeout": 1800,
"idempotent": false,
"io_timeout": 1800,
- "service_account": "[email protected]",
- "shards": 3
+ "service_account": "[email protected]"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
@@ -11470,7 +11558,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -11481,7 +11569,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
+ "name": "pixel_skia_gold_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -11557,14 +11645,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -11596,14 +11684,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_metal_passthrough_ganesh_tests",
+ "name": "screenshot_sync_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -12111,14 +12199,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_gl_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -12150,7 +12238,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -12160,7 +12248,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_gl_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -12347,20 +12435,68 @@
},
{
"args": [
+ "pixel",
+ "--show-stdout",
+ "--browser=release",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
+ "--dont-restore-color-profile-after-test",
+ "--test-machine-name",
+ "${buildername}",
+ "--jobs=1",
+ "--git-revision=${got_revision}"
+ ],
+ "isolate_name": "telemetry_gpu_integration_test",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "pixel_skia_gold_gl_passthrough_ganesh_test",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "cpu": "x86-64",
+ "display_attached": "1",
+ "gpu": "10de:0fe9",
+ "hidpi": "1",
+ "os": "Mac-11.7.9",
+ "pool": "chromium.tests.gpu"
+ },
+ "expiration": 21600,
+ "hard_timeout": 1800,
+ "idempotent": false,
+ "io_timeout": 1800,
+ "service_account": "[email protected]"
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+ },
+ {
+ "args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_gl_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -12807,14 +12943,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -12844,14 +12980,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_metal_passthrough_ganesh_tests",
+ "name": "context_lost_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -12926,7 +13062,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -12936,7 +13072,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -12971,7 +13107,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -12981,7 +13117,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_metal_passthrough_ganesh_test",
+ "name": "expected_color_pixel_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -13210,7 +13346,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -13221,7 +13357,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_gl_passthrough_graphite_test",
+ "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -13244,8 +13380,7 @@
"hard_timeout": 1800,
"idempotent": false,
"io_timeout": 1800,
- "service_account": "[email protected]",
- "shards": 3
+ "service_account": "[email protected]"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
@@ -13257,7 +13392,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -13268,7 +13403,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
+ "name": "pixel_skia_gold_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -13340,14 +13475,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -13377,14 +13512,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_metal_passthrough_ganesh_tests",
+ "name": "screenshot_sync_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -13891,14 +14026,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -13971,7 +14106,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -13981,7 +14116,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -14165,7 +14300,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -14176,7 +14311,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_gl_passthrough_graphite_test",
+ "name": "pixel_skia_gold_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -14198,8 +14333,7 @@
"hard_timeout": 1800,
"idempotent": false,
"io_timeout": 1800,
- "service_account": "[email protected]",
- "shards": 3
+ "service_account": "[email protected]"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
@@ -14247,14 +14381,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -15102,14 +15236,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_gl_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -15140,7 +15274,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -15150,7 +15284,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_gl_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -15295,20 +15429,67 @@
},
{
"args": [
+ "pixel",
+ "--show-stdout",
+ "--browser=debug",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
+ "--dont-restore-color-profile-after-test",
+ "--test-machine-name",
+ "${buildername}",
+ "--jobs=1",
+ "--git-revision=${got_revision}"
+ ],
+ "isolate_name": "telemetry_gpu_integration_test",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "pixel_skia_gold_gl_passthrough_ganesh_test",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "cpu": "x86-64",
+ "display_attached": "1",
+ "gpu": "1002:67ef",
+ "hidpi": "1",
+ "os": "Mac-13.2.1",
+ "pool": "chromium.tests.gpu"
+ },
+ "hard_timeout": 1800,
+ "idempotent": false,
+ "io_timeout": 1800,
+ "service_account": "[email protected]"
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+ },
+ {
+ "args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug",
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_gl_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -15639,14 +15820,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -15723,7 +15904,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -15733,7 +15914,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -15927,7 +16108,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -15938,7 +16119,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_gl_passthrough_graphite_test",
+ "name": "pixel_skia_gold_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -15962,8 +16143,7 @@
"hard_timeout": 1800,
"idempotent": false,
"io_timeout": 1800,
- "service_account": "[email protected]",
- "shards": 3
+ "service_account": "[email protected]"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
@@ -16013,14 +16193,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -16473,14 +16653,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -16511,14 +16691,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_metal_passthrough_ganesh_tests",
+ "name": "context_lost_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -16595,7 +16775,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -16605,7 +16785,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -16641,7 +16821,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -16651,7 +16831,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_metal_passthrough_ganesh_test",
+ "name": "expected_color_pixel_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -16886,7 +17066,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -16897,7 +17077,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_gl_passthrough_graphite_test",
+ "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -16921,8 +17101,7 @@
"hard_timeout": 1800,
"idempotent": false,
"io_timeout": 1800,
- "service_account": "[email protected]",
- "shards": 3
+ "service_account": "[email protected]"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
@@ -16934,7 +17113,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -16945,7 +17124,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
+ "name": "pixel_skia_gold_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -17019,14 +17198,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -17057,14 +17236,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_metal_passthrough_ganesh_tests",
+ "name": "screenshot_sync_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -17557,14 +17736,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_gl_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -17595,7 +17774,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -17605,7 +17784,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_gl_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -17787,20 +17966,67 @@
},
{
"args": [
+ "pixel",
+ "--show-stdout",
+ "--browser=release",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
+ "--dont-restore-color-profile-after-test",
+ "--test-machine-name",
+ "${buildername}",
+ "--jobs=1",
+ "--git-revision=${got_revision}"
+ ],
+ "isolate_name": "telemetry_gpu_integration_test",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "pixel_skia_gold_gl_passthrough_ganesh_test",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "cpu": "x86-64",
+ "display_attached": "1",
+ "gpu": "10de:0fe9",
+ "hidpi": "1",
+ "os": "Mac-10.14.6",
+ "pool": "chromium.tests.gpu"
+ },
+ "hard_timeout": 1800,
+ "idempotent": false,
+ "io_timeout": 1800,
+ "service_account": "[email protected]"
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
+ },
+ {
+ "args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_gl_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
diff --git a/testing/buildbot/client.v8.fyi.json b/testing/buildbot/client.v8.fyi.json
index 6f7bd6b..ff8b8d3 100644
--- a/testing/buildbot/client.v8.fyi.json
+++ b/testing/buildbot/client.v8.fyi.json
@@ -1069,14 +1069,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_gl_passthrough_graphite_tests",
+ "name": "context_lost_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -1102,14 +1102,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--jobs=4"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "context_lost_metal_passthrough_ganesh_tests",
+ "name": "context_lost_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -1176,7 +1176,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -1186,7 +1186,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_gl_passthrough_graphite_test",
+ "name": "expected_color_pixel_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -1217,7 +1217,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -1227,7 +1227,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "expected_color_pixel_metal_passthrough_ganesh_test",
+ "name": "expected_color_pixel_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -1396,7 +1396,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -1407,7 +1407,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_gl_passthrough_graphite_test",
+ "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -1426,8 +1426,7 @@
"os": "Mac-13.3.1"
},
"idempotent": false,
- "service_account": "[email protected]",
- "shards": 3
+ "service_account": "[email protected]"
},
"test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/"
},
@@ -1439,7 +1438,7 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test",
"--test-machine-name",
"${buildername}",
@@ -1450,7 +1449,7 @@
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "pixel_skia_gold_metal_passthrough_ganesh_test",
+ "name": "pixel_skia_gold_metal_passthrough_graphite_test",
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
@@ -1514,14 +1513,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_gl_passthrough_graphite_tests",
+ "name": "screenshot_sync_metal_passthrough_ganesh_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -1547,14 +1546,14 @@
"--passthrough",
"-v",
"--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --disable-features=SkiaGraphite",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-cmd-decoder=passthrough --use-gl=angle --use-angle=metal --enable-features=SkiaGraphite",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
- "name": "screenshot_sync_metal_passthrough_ganesh_tests",
+ "name": "screenshot_sync_metal_passthrough_graphite_tests",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 5ad76eb6..fae5303 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -2315,13 +2315,13 @@
},
},
},
- 'context_lost_gl_passthrough_graphite_tests': {
+ 'context_lost_metal_passthrough_ganesh_tests': {
'remove_from': [
# crbug.com/1458020 for Mac Retina ASAN removal
'Mac FYI Retina ASAN (AMD)',
],
},
- 'context_lost_metal_passthrough_ganesh_tests': {
+ 'context_lost_metal_passthrough_graphite_tests': {
'remove_from': [
# crbug.com/1458020 for Mac Retina ASAN removal
'Mac FYI Retina ASAN (AMD)',
@@ -2522,7 +2522,7 @@
},
},
},
- 'expected_color_pixel_gl_passthrough_graphite_test': {
+ 'expected_color_pixel_metal_passthrough_ganesh_test': {
'remove_from': [
# crbug.com/1458020 for Mac Retina ASAN removal
'Mac FYI Retina ASAN (AMD)',
@@ -2535,7 +2535,7 @@
},
},
},
- 'expected_color_pixel_metal_passthrough_ganesh_test': {
+ 'expected_color_pixel_metal_passthrough_graphite_test': {
'remove_from': [
# crbug.com/1458020 for Mac Retina ASAN removal
'Mac FYI Retina ASAN (AMD)',
@@ -3788,58 +3788,10 @@
},
},
},
- 'pixel_skia_gold_gl_passthrough_graphite_test': {
- # crbug.com/1469875 Remove when failing tests are fixed on Graphite
- 'modifications': {
- 'Mac FYI Experimental Release (Apple M1)': {
- 'swarming': {
- 'shards': 3,
- },
- },
- 'Mac FYI Experimental Release (Intel)': {
- 'swarming': {
- 'shards': 3,
- },
- },
- 'Mac FYI Experimental Retina Release (AMD)': {
- 'swarming': {
- 'shards': 3,
- },
- },
- 'Mac FYI Release (Apple M1)': {
- 'swarming': {
- 'shards': 3,
- },
- },
- 'Mac FYI Release (Intel)': {
- 'swarming': {
- 'shards': 3,
- },
- },
- 'Mac FYI Retina Release (AMD)': {
- 'swarming': {
- 'shards': 3,
- },
- },
- 'Mac FYI Retina Release (Apple M2)': {
- 'swarming': {
- 'shards': 3,
- },
- },
- 'Mac V8 FYI Release (Intel)': {
- 'swarming': {
- 'shards': 3,
- },
- },
- },
+ 'pixel_skia_gold_metal_passthrough_ganesh_test': {
'remove_from': [
- # crbug.com/1469875 Too slow on Debug, ASAN and NVIDIA
- 'Mac FYI ASAN (Intel)',
- 'Mac FYI Debug (Intel)',
- 'Mac FYI Experimental Retina Release (NVIDIA)',
- 'Mac FYI Retina ASAN (AMD)', # Also affected by crbug.com/1458020
- 'Mac FYI Retina Debug (AMD)',
- 'Mac FYI Retina Release (NVIDIA)',
+ # crbug.com/1458020 for Mac Retina ASAN removal
+ 'Mac FYI Retina ASAN (AMD)',
],
'replacements': {
'Mac V8 FYI Release (Intel)': {
@@ -3849,7 +3801,7 @@
},
},
},
- 'pixel_skia_gold_metal_passthrough_ganesh_test': {
+ 'pixel_skia_gold_metal_passthrough_graphite_test': {
'remove_from': [
# crbug.com/1458020 for Mac Retina ASAN removal
'Mac FYI Retina ASAN (AMD)',
@@ -3993,13 +3945,13 @@
},
},
},
- 'screenshot_sync_gl_passthrough_graphite_tests': {
+ 'screenshot_sync_metal_passthrough_ganesh_tests': {
'remove_from': [
# crbug.com/1458020 for Mac Retina ASAN removal
'Mac FYI Retina ASAN (AMD)',
],
},
- 'screenshot_sync_metal_passthrough_ganesh_tests': {
+ 'screenshot_sync_metal_passthrough_graphite_tests': {
'remove_from': [
# crbug.com/1458020 for Mac Retina ASAN removal
'Mac FYI Retina ASAN (AMD)',
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index ef7e1dc..fed95d7 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -3146,71 +3146,6 @@
},
},
- 'gpu_gl_passthrough_graphite_telemetry_tests': {
- 'context_lost_gl_passthrough_graphite': {
- 'name': 'context_lost_gl_passthrough_graphite_tests',
- 'telemetry_test_name': 'context_lost',
- 'args': [
- '--extra-browser-args=--use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite',
- '$$MAGIC_SUBSTITUTION_GPUParallelJobs',
- ],
- 'mixins': [
- 'has_native_resultdb_integration',
- ],
- },
- 'expected_color_gl_passthrough_graphite': {
- 'name': 'expected_color_pixel_gl_passthrough_graphite_test',
- 'telemetry_test_name': 'expected_color',
- 'args': [
- '--dont-restore-color-profile-after-test',
- '--test-machine-name',
- '${buildername}',
- '--extra-browser-args=--use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite',
- ],
- 'mixins': [
- 'skia_gold_test',
- 'has_native_resultdb_integration',
- ],
- },
- 'gpu_process': {
- 'name': 'gpu_process_launch_tests',
- 'mixins': [
- 'has_native_resultdb_integration',
- ],
- },
- 'hardware_accelerated_feature': {
- 'mixins': [
- 'has_native_resultdb_integration',
- ],
- },
- 'pixel_skia_gl_passthrough_graphite': {
- 'name': 'pixel_skia_gold_gl_passthrough_graphite_test',
- 'args': [
- '--dont-restore-color-profile-after-test',
- '--test-machine-name',
- '${buildername}',
- '--extra-browser-args=--use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite',
- '$$MAGIC_SUBSTITUTION_GPUParallelJobs',
- ],
- 'mixins': [
- 'skia_gold_test',
- 'has_native_resultdb_integration',
- ],
- 'telemetry_test_name': 'pixel',
- },
- 'screenshot_sync_gl_passthrough_graphite': {
- 'name': 'screenshot_sync_gl_passthrough_graphite_tests',
- 'telemetry_test_name': 'screenshot_sync',
- 'args': [
- '--dont-restore-color-profile-after-test',
- '--extra-browser-args=--use-cmd-decoder=passthrough --use-gl=angle --use-angle=gl --enable-features=SkiaGraphite',
- ],
- 'mixins': [
- 'has_native_resultdb_integration',
- ],
- },
- },
-
'gpu_gles2_conform_gtests': {
# The gles2_conform_tests are closed-source and deliberately only
# run on the FYI waterfall and the optional tryservers.
@@ -6661,9 +6596,9 @@
'gpu_webgl_conformance_validating_telemetry_tests',
],
- 'gpu_common_gl_passthrough_graphite_telemetry_tests': [
+ 'gpu_common_gl_passthrough_ganesh_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
- 'gpu_gl_passthrough_graphite_telemetry_tests',
+ 'gpu_gl_passthrough_ganesh_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
],
@@ -6873,7 +6808,7 @@
'gpu_fyi_mac_nvidia_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
- 'gpu_gl_passthrough_graphite_telemetry_tests',
+ 'gpu_gl_passthrough_ganesh_telemetry_tests',
'gpu_mediapipe_passthrough_telemetry_tests',
'gpu_webcodecs_telemetry_test',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
@@ -6899,8 +6834,8 @@
'gpu_fyi_mac_release_telemetry_tests': [
'gpu_gl_passthrough_ganesh_telemetry_tests',
- 'gpu_gl_passthrough_graphite_telemetry_tests',
'gpu_mediapipe_passthrough_telemetry_tests',
+ 'gpu_metal_passthrough_graphite_telemetry_tests',
'gpu_webcodecs_telemetry_test',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_metal_passthrough_telemetry_tests',
@@ -6911,9 +6846,9 @@
'gpu_fyi_only_mac_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_gl_passthrough_ganesh_telemetry_tests',
- 'gpu_gl_passthrough_graphite_telemetry_tests',
'gpu_mediapipe_passthrough_telemetry_tests',
'gpu_metal_passthrough_ganesh_telemetry_tests',
+ 'gpu_metal_passthrough_graphite_telemetry_tests',
'gpu_webcodecs_telemetry_test',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_metal_passthrough_telemetry_tests',
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 12cdef5..8c26b409 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -4596,7 +4596,7 @@
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_debug_gtests',
- 'gpu_telemetry_tests': 'gpu_common_gl_passthrough_graphite_telemetry_tests',
+ 'gpu_telemetry_tests': 'gpu_common_gl_passthrough_ganesh_telemetry_tests',
},
},
'Mac FYI Experimental Release (Apple M1)': {
@@ -4700,7 +4700,7 @@
],
'test_suites': {
'gtest_tests': 'gpu_fyi_mac_debug_gtests',
- 'gpu_telemetry_tests': 'gpu_common_gl_passthrough_graphite_telemetry_tests',
+ 'gpu_telemetry_tests': 'gpu_common_gl_passthrough_ganesh_telemetry_tests',
},
},
'Mac FYI Retina Release (AMD)': {
