Add Gold dryrun usage to Blink web tests
Adds a dryrun usage of Skia Gold to the pixel tests in the Blink web
tests. Data will be uploaded to Gold as if it were being used for
image comparisons, but any output or exceptions will be ignored. This
is so that the Gold team can see what sort of data the web tests are
producing in order to help determine whether Gold can be adapted to
meet the tests' needs.
Test runtime with this patch vs. without seems to be within margin
of error (+/- a few minutes per bot), so this is not expected to have
any noticeable impact on testing.
Bug: 1290526
Change-Id: Iee484e59c45fd1eef2c4cd1b1c563358eafe653b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3312012
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Commit-Position: refs/heads/main@{#969203}
diff --git a/BUILD.gn b/BUILD.gn
index 850e85a..cb39f243 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1168,6 +1168,7 @@
}
data = [
+ "//build/skia_gold_common/",
"//testing/scripts/common.py",
"//testing/scripts/run_isolated_script_test.py",
"//testing/xvfb.py",
@@ -1181,6 +1182,7 @@
"//third_party/pywebsocket3/src/mod_pywebsocket/",
"//third_party/test_fonts/test_fonts/",
"//third_party/wpt_tools/",
+ "//tools/skia_goldctl/",
]
if (is_win) {
@@ -1467,6 +1469,7 @@
"//build/android/",
"//build/gn_helpers.py",
"//build/config/gclient_args.gni",
+ "//build/skia_gold_common/",
"//components/crash/content/tools/generate_breakpad_symbols.py",
"//testing/unexpected_passes_common/",
"//third_party/blink/renderer/bindings/scripts/",
@@ -1490,6 +1493,7 @@
"//third_party/depot_tools/pylintrc",
"//third_party/ply/",
"//tools/idl_parser/",
+ "//tools/skia_goldctl/",
]
}
}
diff --git a/testing/buildbot/chromium.clang.json b/testing/buildbot/chromium.clang.json
index 88719be..a3d1978 100644
--- a/testing/buildbot/chromium.clang.json
+++ b/testing/buildbot/chromium.clang.json
@@ -9982,6 +9982,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--platform=fuchsia"
],
"isolate_name": "blink_web_tests",
@@ -9992,6 +9993,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -10004,7 +10010,7 @@
"os": "Ubuntu-16.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
@@ -23087,7 +23093,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -23097,6 +23104,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -23109,7 +23121,7 @@
"os": "Mac-10.15"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -26668,7 +26680,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -26678,6 +26691,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -26691,7 +26709,7 @@
"pool": "chrome.tests"
}
],
- "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/chromium.dawn.json b/testing/buildbot/chromium.dawn.json
index 9ffb0fc..d9968beb 100644
--- a/testing/buildbot/chromium.dawn.json
+++ b/testing/buildbot/chromium.dawn.json
@@ -196,7 +196,8 @@
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--no-xvfb",
- "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
+ "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -206,6 +207,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -218,7 +224,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -229,7 +235,8 @@
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--no-xvfb",
- "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
+ "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -239,6 +246,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -251,7 +263,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -451,7 +463,8 @@
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--no-xvfb",
- "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
+ "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -461,6 +474,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -473,7 +491,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -484,7 +502,8 @@
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--no-xvfb",
- "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
+ "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -494,6 +513,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -506,7 +530,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -706,7 +730,8 @@
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--no-xvfb",
- "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
+ "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -716,6 +741,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -728,7 +758,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -739,7 +769,8 @@
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--no-xvfb",
- "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
+ "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -749,6 +780,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -761,7 +797,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -961,7 +997,8 @@
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--no-xvfb",
- "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
+ "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -971,6 +1008,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -983,7 +1025,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -994,7 +1036,8 @@
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--no-xvfb",
- "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
+ "--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -1004,6 +1047,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1016,7 +1064,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -1232,7 +1280,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -1242,6 +1291,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1257,7 +1311,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -1267,7 +1321,8 @@
"--flag-specific=webgpu-with-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -1277,6 +1332,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1292,7 +1352,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -1490,7 +1550,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -1500,6 +1561,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1513,7 +1579,7 @@
"os": "Mac-11.5.2"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -1523,7 +1589,8 @@
"--flag-specific=webgpu-with-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -1533,6 +1600,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1546,7 +1618,7 @@
"os": "Mac-11.5.2"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -1767,7 +1839,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -1777,6 +1850,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1793,7 +1871,7 @@
}
],
"expiration": 21600,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -1803,7 +1881,8 @@
"--flag-specific=webgpu-with-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -1813,6 +1892,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1829,7 +1913,7 @@
}
],
"expiration": 21600,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -2079,7 +2163,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -2089,6 +2174,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -2104,7 +2194,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -2114,7 +2204,8 @@
"--flag-specific=webgpu-with-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -2124,6 +2215,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -2139,7 +2235,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -2337,7 +2433,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -2347,6 +2444,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -2360,7 +2462,7 @@
"os": "Mac-11.5.2"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -2370,7 +2472,8 @@
"--flag-specific=webgpu-with-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--platform=mac-mac11"
+ "--platform=mac-mac11",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -2380,6 +2483,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -2393,7 +2501,7 @@
"os": "Mac-11.5.2"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -2591,6 +2699,7 @@
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--target=Release_x64",
+ "--git-revision=${got_revision}",
"--timeout-ms=48000"
],
"isolate_name": "webgpu_blink_web_tests",
@@ -2601,6 +2710,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -2618,7 +2732,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -2813,7 +2927,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--target=Release_x64"
+ "--target=Release_x64",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -2823,6 +2938,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -2835,7 +2955,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -2845,7 +2965,8 @@
"--flag-specific=webgpu-with-partial-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--target=Release_x64"
+ "--target=Release_x64",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -2855,6 +2976,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_partial_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -2867,7 +2993,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -3060,7 +3186,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--target=Release_x64"
+ "--target=Release_x64",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -3070,6 +3197,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3082,7 +3214,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -3092,7 +3224,8 @@
"--flag-specific=webgpu-with-partial-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--target=Release_x64"
+ "--target=Release_x64",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -3102,6 +3235,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_partial_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3114,7 +3252,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -3307,7 +3445,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--target=Release_x64"
+ "--target=Release_x64",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -3317,6 +3456,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3329,7 +3473,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -3339,7 +3483,8 @@
"--flag-specific=webgpu-with-partial-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--target=Release_x64"
+ "--target=Release_x64",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -3349,6 +3494,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_partial_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3361,7 +3511,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -3554,7 +3704,8 @@
"args": [
"--flag-specific=webgpu",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--target=Release_x64"
+ "--target=Release_x64",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -3564,6 +3715,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3576,7 +3732,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -3586,7 +3742,8 @@
"--flag-specific=webgpu-with-partial-backend-validation",
"--timeout-ms=30000",
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
- "--target=Release_x64"
+ "--target=Release_x64",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -3596,6 +3753,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_partial_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3608,7 +3770,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -3802,7 +3964,8 @@
{
"args": [
"--flag-specific=webgpu",
- "--initialize-webgpu-adapter-at-startup-timeout-ms=60000"
+ "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -3812,6 +3975,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3824,7 +3992,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -3833,7 +4001,8 @@
"args": [
"--flag-specific=webgpu-with-partial-backend-validation",
"--timeout-ms=30000",
- "--initialize-webgpu-adapter-at-startup-timeout-ms=60000"
+ "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -3843,6 +4012,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_partial_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3855,7 +4029,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -4047,7 +4221,8 @@
{
"args": [
"--flag-specific=webgpu",
- "--initialize-webgpu-adapter-at-startup-timeout-ms=60000"
+ "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -4057,6 +4232,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -4069,7 +4249,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -4078,7 +4258,8 @@
"args": [
"--flag-specific=webgpu-with-partial-backend-validation",
"--timeout-ms=30000",
- "--initialize-webgpu-adapter-at-startup-timeout-ms=60000"
+ "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -4088,6 +4269,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_partial_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -4100,7 +4286,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -4292,7 +4478,8 @@
{
"args": [
"--flag-specific=webgpu",
- "--initialize-webgpu-adapter-at-startup-timeout-ms=60000"
+ "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -4302,6 +4489,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -4314,7 +4506,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -4323,7 +4515,8 @@
"args": [
"--flag-specific=webgpu-with-partial-backend-validation",
"--timeout-ms=30000",
- "--initialize-webgpu-adapter-at-startup-timeout-ms=60000"
+ "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -4333,6 +4526,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_partial_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -4345,7 +4543,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -4537,7 +4735,8 @@
{
"args": [
"--flag-specific=webgpu",
- "--initialize-webgpu-adapter-at-startup-timeout-ms=60000"
+ "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -4547,6 +4746,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -4559,7 +4763,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
@@ -4568,7 +4772,8 @@
"args": [
"--flag-specific=webgpu-with-partial-backend-validation",
"--timeout-ms=30000",
- "--initialize-webgpu-adapter-at-startup-timeout-ms=60000"
+ "--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
+ "--git-revision=${got_revision}"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@@ -4578,6 +4783,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests_with_partial_backend_validation",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -4590,7 +4800,7 @@
"pool": "chromium.tests.gpu"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webgpu_blink_web_tests/"
diff --git a/testing/buildbot/chromium.devtools-frontend.json b/testing/buildbot/chromium.devtools-frontend.json
index edfe099..007afd48 100644
--- a/testing/buildbot/chromium.devtools-frontend.json
+++ b/testing/buildbot/chromium.devtools-frontend.json
@@ -28,7 +28,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -38,6 +39,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -49,7 +55,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 274d512..7d3e923 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -1579,7 +1579,8 @@
"--num-retries=3",
"--skipped=always",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
- "--flag-specific=skia-vulkan-swiftshader"
+ "--flag-specific=skia-vulkan-swiftshader",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -1589,6 +1590,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "vulkan_swiftshader_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1600,7 +1606,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://:blink_web_tests/"
}
@@ -3066,7 +3072,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"experiment_percentage": 0,
"isolate_name": "blink_web_tests",
@@ -3077,6 +3084,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3089,7 +3101,7 @@
"os": "Mac-12"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -3704,6 +3716,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--flag-specific=disable-layout-ng"
],
"isolate_name": "blink_web_tests",
@@ -3714,6 +3727,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3726,7 +3744,7 @@
}
],
"hard_timeout": 900,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -6914,6 +6932,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--target",
"Release_x64"
],
@@ -6926,6 +6945,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -6938,7 +6962,7 @@
"os": "Windows-11-22000"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 28
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -21718,7 +21742,8 @@
{
"args": [
"--num-retries=3",
- "--device=aemu"
+ "--device=aemu",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -21728,6 +21753,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -21741,7 +21771,7 @@
"os": "Ubuntu-20.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -77812,6 +77842,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--debug"
],
"isolate_name": "blink_web_tests",
@@ -77822,6 +77853,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -77833,7 +77869,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -79421,7 +79457,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -79431,6 +79468,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -79442,7 +79484,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -79454,7 +79496,8 @@
{
"args": [
"--flag-specific=highdpi",
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -79464,6 +79507,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "high_dpi_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -79475,7 +79523,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -79486,7 +79534,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -79496,6 +79545,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -79507,7 +79561,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -80264,7 +80318,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -80274,6 +80329,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -80285,7 +80345,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -83656,6 +83716,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-env-var=LLVM_PROFILE_FILE=${ISOLATED_OUTDIR}/profraw/default-%2m.profraw"
],
"isolate_name": "blink_web_tests",
@@ -83667,6 +83728,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -83678,7 +83744,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -83798,7 +83864,8 @@
{
"args": [
"--flag-specific=highdpi",
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"isolate_profile_data": true,
@@ -83809,6 +83876,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "high_dpi_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -83820,7 +83892,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -83851,6 +83923,7 @@
"args": [
"--flag-specific=disable-site-isolation-trials",
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-env-var=LLVM_PROFILE_FILE=${ISOLATED_OUTDIR}/profraw/default-%2m.profraw"
],
"isolate_name": "blink_web_tests",
@@ -83862,6 +83935,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "not_site_per_process_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -83873,7 +83951,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -83985,7 +84063,8 @@
"--num-retries=3",
"--skipped=always",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
- "--flag-specific=skia-vulkan-swiftshader"
+ "--flag-specific=skia-vulkan-swiftshader",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"isolate_profile_data": true,
@@ -83996,6 +84075,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "vulkan_swiftshader_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -84007,7 +84091,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
@@ -92298,7 +92382,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"experiment_percentage": 0,
"isolate_name": "blink_web_tests",
@@ -92309,6 +92394,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -92322,7 +92412,7 @@
}
],
"expiration": 21600,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -94549,7 +94639,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -94559,6 +94650,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -94571,7 +94667,7 @@
"os": "Mac-10.12.6"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -94582,7 +94678,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -94592,6 +94689,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -94607,7 +94709,7 @@
}
],
"hard_timeout": 900,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -94618,7 +94720,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -94628,6 +94731,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -94641,7 +94749,7 @@
}
],
"hard_timeout": 1800,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -94652,7 +94760,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -94662,6 +94771,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -94677,7 +94791,7 @@
}
],
"hard_timeout": 900,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -94688,7 +94802,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -94698,6 +94813,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -94711,7 +94831,7 @@
}
],
"hard_timeout": 1800,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -94722,7 +94842,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -94732,6 +94853,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -94744,7 +94870,7 @@
"os": "Mac-11"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -98465,7 +98591,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -98475,6 +98602,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -98487,7 +98619,7 @@
}
],
"hard_timeout": 1200,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 14
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -98498,7 +98630,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -98508,6 +98641,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -98520,7 +98658,7 @@
}
],
"hard_timeout": 900,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 6d2294e..115871da 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -4295,6 +4295,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--platform=fuchsia",
"--jobs=1"
],
@@ -4306,6 +4307,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -4318,7 +4324,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://:blink_web_tests/"
}
@@ -6059,6 +6065,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-env-var=LLVM_PROFILE_FILE=${ISOLATED_OUTDIR}/profraw/default-%2m.profraw"
],
"isolate_name": "blink_web_tests",
@@ -6070,6 +6077,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -6082,7 +6094,7 @@
}
],
"quickrun_shards": 18,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -6202,7 +6214,8 @@
{
"args": [
"--flag-specific=highdpi",
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"isolate_profile_data": true,
@@ -6213,6 +6226,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "high_dpi_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -6224,7 +6242,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -6255,6 +6273,7 @@
"args": [
"--flag-specific=disable-site-isolation-trials",
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-env-var=LLVM_PROFILE_FILE=${ISOLATED_OUTDIR}/profraw/default-%2m.profraw"
],
"isolate_name": "blink_web_tests",
@@ -6266,6 +6285,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "not_site_per_process_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -6278,7 +6302,7 @@
}
],
"quickrun_shards": 18,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -6392,7 +6416,8 @@
"--num-retries=3",
"--skipped=always",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
- "--flag-specific=skia-vulkan-swiftshader"
+ "--flag-specific=skia-vulkan-swiftshader",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"isolate_profile_data": true,
@@ -6403,6 +6428,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "vulkan_swiftshader_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -6414,7 +6444,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://:blink_web_tests/"
}
@@ -9848,6 +9878,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--debug"
],
"isolate_name": "blink_web_tests",
@@ -9858,6 +9889,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -9869,7 +9905,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 30
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -10199,6 +10235,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--flag-specific=enable-back-forward-cache-same-site",
"--ignore-tests=external/wpt/html/browsers/browsing-the-web/back-forward-cache/events.html"
],
@@ -10210,6 +10247,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -10221,7 +10263,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -11767,7 +11809,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -11777,6 +11820,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -11788,7 +11836,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -11903,7 +11951,8 @@
{
"args": [
"--flag-specific=highdpi",
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -11913,6 +11962,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "high_dpi_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -11924,7 +11978,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -11953,7 +12007,8 @@
{
"args": [
"--flag-specific=disable-site-isolation-trials",
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -11963,6 +12018,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "not_site_per_process_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -11974,7 +12034,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -12084,7 +12144,8 @@
"--num-retries=3",
"--skipped=always",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
- "--flag-specific=skia-vulkan-swiftshader"
+ "--flag-specific=skia-vulkan-swiftshader",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -12094,6 +12155,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "vulkan_swiftshader_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -12105,7 +12171,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
@@ -13721,7 +13787,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -13731,6 +13798,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -13742,7 +13814,7 @@
"os": "Ubuntu-14.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -13857,7 +13929,8 @@
{
"args": [
"--flag-specific=highdpi",
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -13867,6 +13940,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "high_dpi_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -13878,7 +13956,7 @@
"os": "Ubuntu-14.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -13907,7 +13985,8 @@
{
"args": [
"--flag-specific=disable-site-isolation-trials",
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -13917,6 +13996,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "not_site_per_process_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -13928,7 +14012,7 @@
"os": "Ubuntu-14.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -14038,7 +14122,8 @@
"--num-retries=3",
"--skipped=always",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
- "--flag-specific=skia-vulkan-swiftshader"
+ "--flag-specific=skia-vulkan-swiftshader",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -14048,6 +14133,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "vulkan_swiftshader_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -14059,7 +14149,7 @@
"os": "Ubuntu-14.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
@@ -15663,6 +15753,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-env-var=LLVM_PROFILE_FILE=${ISOLATED_OUTDIR}/profraw/default-%2m.profraw"
],
"isolate_name": "blink_web_tests",
@@ -15673,6 +15764,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -15684,7 +15780,7 @@
"os": "Ubuntu-16.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -15799,7 +15895,8 @@
{
"args": [
"--flag-specific=highdpi",
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -15809,6 +15906,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "high_dpi_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -15820,7 +15922,7 @@
"os": "Ubuntu-16.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -15850,6 +15952,7 @@
"args": [
"--flag-specific=disable-site-isolation-trials",
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-env-var=LLVM_PROFILE_FILE=${ISOLATED_OUTDIR}/profraw/default-%2m.profraw"
],
"isolate_name": "blink_web_tests",
@@ -15860,6 +15963,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "not_site_per_process_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -15871,7 +15979,7 @@
"os": "Ubuntu-16.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -15981,7 +16089,8 @@
"--num-retries=3",
"--skipped=always",
"--test-list=../../testing/buildbot/filters/gpu.skiarenderer_vulkan_blink_web_tests.filter",
- "--flag-specific=skia-vulkan-swiftshader"
+ "--flag-specific=skia-vulkan-swiftshader",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -15991,6 +16100,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "vulkan_swiftshader_blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -16002,7 +16116,7 @@
"os": "Ubuntu-16.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com"
},
"test_id_prefix": "ninja://:blink_web_tests/"
}
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 0196da7..caebffa 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -3111,7 +3111,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -3121,6 +3122,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3133,7 +3139,7 @@
"os": "Mac-10.12.6"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 25
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -4853,7 +4859,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -4863,6 +4870,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -4875,7 +4887,7 @@
"os": "Mac-10.13.6"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 25
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -6583,7 +6595,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -6593,6 +6606,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -6605,7 +6623,7 @@
"os": "Mac-10.14.6"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -8321,7 +8339,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -8331,6 +8350,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -8343,7 +8367,7 @@
"os": "Mac-10.15"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 25
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -10136,7 +10160,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"isolate_profile_data": true,
@@ -10147,6 +10172,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -10160,7 +10190,7 @@
}
],
"quickrun_shards": 26,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 25
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -11928,6 +11958,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--debug"
],
"experiment_percentage": 100,
@@ -11939,6 +11970,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -11951,7 +11987,7 @@
"os": "Mac-11|Mac-10.16"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 40
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -23924,7 +23960,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"ci_only": true,
"isolate_name": "blink_web_tests",
@@ -23935,6 +23972,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -23947,7 +23989,7 @@
"os": "Mac-11"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index b68b674..76c2ef9 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -12490,6 +12490,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-expectations",
"../../third_party/blink/web_tests/ASANExpectations",
"--timeout-ms",
@@ -12504,6 +12505,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -12515,7 +12521,7 @@
"os": "Ubuntu-16.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -12530,6 +12536,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-expectations",
"../../third_party/blink/web_tests/LeakExpectations",
"--timeout-ms",
@@ -12544,6 +12551,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -12555,7 +12567,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -12567,6 +12579,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--additional-expectations",
"../../third_party/blink/web_tests/MSANExpectations",
"--timeout-ms",
@@ -12581,6 +12594,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -12595,7 +12613,7 @@
"expiration": 36000,
"hard_timeout": 10800,
"io_timeout": 3600,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index a4d5bcd3..b079016 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -5,7 +5,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -15,6 +16,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -26,7 +32,7 @@
"os": "Windows-10-19042"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -3537,6 +3543,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--target",
"Release_x64"
],
@@ -3549,6 +3556,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -3561,7 +3573,7 @@
"os": "Windows-10-19042"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 28
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -7216,7 +7228,8 @@
},
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -7226,13 +7239,18 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -8709,6 +8727,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--debug",
"--timeout-ms",
"60000"
@@ -8722,6 +8741,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -8733,7 +8757,7 @@
"os": "Windows-7-SP1"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/client.devtools-frontend.integration.json b/testing/buildbot/client.devtools-frontend.integration.json
index 47575631..9d67c79 100644
--- a/testing/buildbot/client.devtools-frontend.integration.json
+++ b/testing/buildbot/client.devtools-frontend.integration.json
@@ -49,7 +49,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -59,6 +60,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -70,7 +76,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -155,7 +161,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -165,6 +172,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -176,7 +188,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/client.v8.fyi.json b/testing/buildbot/client.v8.fyi.json
index 0ecaa136..9b403ba 100644
--- a/testing/buildbot/client.v8.fyi.json
+++ b/testing/buildbot/client.v8.fyi.json
@@ -1459,7 +1459,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -1469,6 +1470,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1480,7 +1486,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -1515,6 +1521,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"-t",
"Debug",
"--release"
@@ -1527,6 +1534,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1538,7 +1550,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -1573,6 +1585,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--flag-specific=future-js"
],
"isolate_name": "blink_web_tests",
@@ -1583,6 +1596,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1594,7 +1612,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -1629,7 +1647,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -1639,6 +1658,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1651,7 +1675,7 @@
"os": "Mac-10.13"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -1665,7 +1689,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -1675,6 +1700,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -1686,7 +1716,7 @@
"os": "Windows-10-19042"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index ce485d5..cbd65b76 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -1218,6 +1218,10 @@
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
+ 'mixins': [
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'resultdb': {
'enable': True,
},
@@ -1259,6 +1263,10 @@
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
+ 'mixins': [
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'resultdb': {
'enable': True,
},
@@ -1284,6 +1292,10 @@
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
+ 'mixins': [
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'resultdb': {
'enable': True,
},
@@ -1489,6 +1501,10 @@
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
+ 'mixins': [
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'resultdb': {
'enable': True,
},
@@ -1577,6 +1593,10 @@
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
+ 'mixins': [
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'resultdb': {
'enable': True,
},
@@ -2509,7 +2529,6 @@
'use_isolated_scripts_api': True,
},
},
-
# The command buffer perf tests are only run on Windows.
# They are mostly driver and platform independent.
'gpu_command_buffer_perf_passthrough_isolated_scripts': {
@@ -3723,7 +3742,11 @@
# Increase the timeout when using backend validation layers (crbug.com/1208253)
'--timeout-ms=30000',
],
- 'mixins': ['webgpu_cts'],
+ 'mixins': [
+ 'webgpu_cts',
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'swarming': {
'shards': 4,
},
@@ -3737,7 +3760,11 @@
'args': [
'--flag-specific=webgpu',
],
- 'mixins': ['webgpu_cts'],
+ 'mixins': [
+ 'webgpu_cts',
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'swarming': {
'shards': 4,
},
@@ -3755,7 +3782,11 @@
# Increase the timeout when using backend validation layers (crbug.com/1208253)
'--timeout-ms=30000',
],
- 'mixins': ['webgpu_cts'],
+ 'mixins': [
+ 'webgpu_cts',
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'swarming': {
'shards': 4,
},
@@ -4133,6 +4164,10 @@
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
+ 'mixins': [
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'resultdb': {
'enable': True,
},
@@ -5008,6 +5043,10 @@
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
+ 'mixins': [
+ 'chrome-gold-service-account',
+ 'skia_gold_test',
+ ],
'resultdb': {
'enable': True,
},
diff --git a/testing/buildbot/tryserver.chromium.linux.json b/testing/buildbot/tryserver.chromium.linux.json
index ff288d16..5f75618 100644
--- a/testing/buildbot/tryserver.chromium.linux.json
+++ b/testing/buildbot/tryserver.chromium.linux.json
@@ -14,6 +14,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--flag-specific=force-renderer-accessibility"
],
"isolate_name": "blink_web_tests",
@@ -24,6 +25,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -35,7 +41,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -50,6 +56,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"--flag-specific=enable-editing-ng"
],
"isolate_name": "blink_web_tests",
@@ -60,6 +67,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -71,7 +83,7 @@
"os": "Ubuntu-16.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/buildbot/tryserver.devtools-frontend.json b/testing/buildbot/tryserver.devtools-frontend.json
index ba728d0..d7edec2 100644
--- a/testing/buildbot/tryserver.devtools-frontend.json
+++ b/testing/buildbot/tryserver.devtools-frontend.json
@@ -29,6 +29,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"http/tests/devtools"
],
"isolate_name": "blink_web_tests",
@@ -39,6 +40,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -50,7 +56,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -115,6 +121,7 @@
{
"args": [
"--num-retries=3",
+ "--git-revision=${got_revision}",
"http/tests/devtools"
],
"isolate_name": "blink_web_tests",
@@ -125,6 +132,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -136,7 +148,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:blink_web_tests/"
@@ -177,7 +189,8 @@
"isolated_scripts": [
{
"args": [
- "--num-retries=3"
+ "--num-retries=3",
+ "--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
@@ -187,6 +200,11 @@
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
"resultdb": {
"enable": true
},
@@ -198,7 +216,7 @@
"os": "Ubuntu-18.04"
}
],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
diff --git a/testing/scripts/run_android_wpt.pydeps b/testing/scripts/run_android_wpt.pydeps
index 37fbc3e3..678de7f 100644
--- a/testing/scripts/run_android_wpt.pydeps
+++ b/testing/scripts/run_android_wpt.pydeps
@@ -11,6 +11,11 @@
//build/android/pylib/local/emulator/proto/__init__.py
//build/android/pylib/local/emulator/proto/avd_pb2.py
//build/gn_helpers.py
+//build/skia_gold_common/__init__.py
+//build/skia_gold_common/output_managerless_skia_gold_session.py
+//build/skia_gold_common/skia_gold_properties.py
+//build/skia_gold_common/skia_gold_session.py
+//build/skia_gold_common/skia_gold_session_manager.py
//build/util/lib/__init__.py
//build/util/lib/results/__init__.py
//build/util/lib/results/result_sink.py
@@ -80,6 +85,9 @@
//third_party/blink/tools/blinkpy/web_tests/servers/pywebsocket.py
//third_party/blink/tools/blinkpy/web_tests/servers/server_base.py
//third_party/blink/tools/blinkpy/web_tests/servers/wptserve.py
+//third_party/blink/tools/blinkpy/web_tests/skia_gold/__init__.py
+//third_party/blink/tools/blinkpy/web_tests/skia_gold/blink_skia_gold_properties.py
+//third_party/blink/tools/blinkpy/web_tests/skia_gold/blink_skia_gold_session_manager.py
//third_party/catapult/common/py_utils/py_utils/__init__.py
//third_party/catapult/common/py_utils/py_utils/cloud_storage.py
//third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py
diff --git a/third_party/blink/tools/blinkpy/web_tests/controllers/single_test_runner.py b/third_party/blink/tools/blinkpy/web_tests/controllers/single_test_runner.py
index 0dec168..b505711 100644
--- a/third_party/blink/tools/blinkpy/web_tests/controllers/single_test_runner.py
+++ b/third_party/blink/tools/blinkpy/web_tests/controllers/single_test_runner.py
@@ -37,6 +37,8 @@
_log = logging.getLogger(__name__)
+SKIA_GOLD_CORPUS = 'blink-web-tests'
+
def run_single_test(port, options, results_directory, worker_name, driver,
test_input):
@@ -609,6 +611,31 @@
if not driver_output.image or not driver_output.image_hash:
return []
+ # Do a dry run upload to Skia Gold, ignoring any of its output, for
+ # data collection to see if we can switch to using Gold for web tests
+ # in the future.
+ try:
+ gold_keys = self._port.skia_gold_json_keys()
+ gold_session = (
+ self._port.skia_gold_session_manager().GetSkiaGoldSession(
+ gold_keys, corpus=SKIA_GOLD_CORPUS))
+ gold_properties = self._port.skia_gold_properties()
+ use_luci = not gold_properties.local_pixel_tests
+ img_path = self._filesystem.join(
+ str(self._port.skia_gold_temp_dir()),
+ '%s.png' % self._test_name.replace(self._filesystem.sep, '_'))
+ self._filesystem.write_binary_file(img_path, driver_output.image)
+ status, error = gold_session.RunComparison(name=self._test_name,
+ png_file=img_path,
+ use_luci=use_luci)
+ _log.debug('Ran Skia Gold dry run, got status %s and error %s',
+ status, error)
+ except Exception as e:
+ _log.warning(
+ 'Got exception while dry running Skia Gold. This can be '
+ 'safely ignored unless you are actively working with Gold: %s',
+ e)
+
if driver_output.image_hash != expected_driver_output.image_hash:
diff, err_str = self._port.diff_image(expected_driver_output.image,
driver_output.image)
diff --git a/third_party/blink/tools/blinkpy/web_tests/port/base.py b/third_party/blink/tools/blinkpy/web_tests/port/base.py
index d6bd435..27383853 100644
--- a/third_party/blink/tools/blinkpy/web_tests/port/base.py
+++ b/third_party/blink/tools/blinkpy/web_tests/port/base.py
@@ -63,6 +63,8 @@
from blinkpy.web_tests.servers import apache_http
from blinkpy.web_tests.servers import pywebsocket
from blinkpy.web_tests.servers import wptserve
+from blinkpy.web_tests.skia_gold import blink_skia_gold_properties as sgp
+from blinkpy.web_tests.skia_gold import blink_skia_gold_session_manager as sgsm
_log = logging.getLogger(__name__)
@@ -257,6 +259,15 @@
self._virtual_test_suites = None
self._used_expectation_files = None
+ self._skia_gold_temp_dir = None
+ self._skia_gold_session_manager = None
+ self._skia_gold_properties = None
+
+ def __del__(self):
+ if self._skia_gold_temp_dir:
+ self._filesystem.rmtree(self._skia_gold_temp_dir,
+ ignore_errors=True)
+
def __str__(self):
return 'Port{name=%s, version=%s, architecture=%s, test_configuration=%s}' % (
self._name, self._version, self._architecture,
@@ -397,6 +408,31 @@
return 2 * timeout_ms
return timeout_ms
+ def skia_gold_temp_dir(self):
+ return self._skia_gold_temp_dir
+
+ def skia_gold_properties(self):
+ if not self._skia_gold_properties:
+ self._skia_gold_properties = sgp.BlinkSkiaGoldProperties(
+ self._options)
+ return self._skia_gold_properties
+
+ def skia_gold_session_manager(self):
+ if not self._skia_gold_session_manager:
+ self._skia_gold_temp_dir = self._filesystem.mkdtemp()
+ self._skia_gold_session_manager = sgsm.BlinkSkiaGoldSessionManager(
+ str(self._skia_gold_temp_dir), self.skia_gold_properties())
+ return self._skia_gold_session_manager
+
+ def skia_gold_json_keys(self):
+ return {
+ 'configuration': self._options.configuration.lower(),
+ 'version': self._version,
+ 'port': self.port_name,
+ 'architecture': self._architecture,
+ 'ignore': '1',
+ }
+
@memoized
def _build_has_dcheck_always_on(self):
args_gn_file = self._build_path('args.gn')
diff --git a/third_party/blink/tools/blinkpy/web_tests/port/base_unittest.py b/third_party/blink/tools/blinkpy/web_tests/port/base_unittest.py
index f0e83e2..ef30586 100644
--- a/third_party/blink/tools/blinkpy/web_tests/port/base_unittest.py
+++ b/third_party/blink/tools/blinkpy/web_tests/port/base_unittest.py
@@ -1688,6 +1688,24 @@
finally:
port.host.filesystem.chdir(original_dir)
+ def test_skia_gold_properties_initialization(self):
+ # The Gold code usually assumes that argparse is used, not optparse, so
+ # ensure that it still works with optparse here.
+ port = self.make_port()
+ expected_revision = 'a' * 40
+ expected_issue = '1234'
+ expected_patchset = '1'
+ expected_id = 'bbid'
+ port._options.git_revision = expected_revision
+ port._options.gerrit_issue = expected_issue
+ port._options.gerrit_patchset = expected_patchset
+ port._options.buildbucket_id = expected_id
+ properties = port.skia_gold_properties()
+ self.assertEqual(properties.git_revision, expected_revision)
+ self.assertEqual(properties.issue, expected_issue)
+ self.assertEqual(properties.patchset, expected_patchset)
+ self.assertEqual(properties.job_id, expected_id)
+
class NaturalCompareTest(unittest.TestCase):
def setUp(self):
diff --git a/third_party/blink/tools/blinkpy/web_tests/run_web_tests.py b/third_party/blink/tools/blinkpy/web_tests/run_web_tests.py
index 355122e..bca6203 100644
--- a/third_party/blink/tools/blinkpy/web_tests/run_web_tests.py
+++ b/third_party/blink/tools/blinkpy/web_tests/run_web_tests.py
@@ -611,7 +611,28 @@
'use case is to leave enough time to allow the process to '
'finish post-run hooks, such as dumping code coverage data. '
'Default is 1 second, can be overriden for specific use cases.'
- ))
+ )),
+ optparse.make_option(
+ '--git-revision',
+ help=(
+ 'The Chromium git revision being tested. This is only used '
+ 'for an experimental Skia Gold dryrun.')),
+ optparse.make_option(
+ '--gerrit-issue',
+ help=(
+ 'The Gerrit issue/CL number being tested, if applicable. '
+ 'This is only used for an experimental Skia Gold dryrun.'
+ )),
+ optparse.make_option(
+ '--gerrit-patchset',
+ help=(
+ 'The Gerrit patchset being tested, if applicable. This is '
+ 'only used for an experimental Skia Gold dryrun.')),
+ optparse.make_option(
+ '--buildbucket-id',
+ help=(
+ 'The Buildbucket ID of the bot running the test. This is '
+ 'only used for an experimental Skia Gold dryrun.')),
]))
# FIXME: Move these into json_results_generator.py.
diff --git a/third_party/blink/tools/blinkpy/web_tests/skia_gold/__init__.py b/third_party/blink/tools/blinkpy/web_tests/skia_gold/__init__.py
new file mode 100644
index 0000000..1755286
--- /dev/null
+++ b/third_party/blink/tools/blinkpy/web_tests/skia_gold/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2022 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import sys
+
+from blinkpy.common import path_finder
+
+BUILD_DIR = os.path.join(path_finder.get_chromium_src_dir(), 'build')
+
+if BUILD_DIR not in sys.path:
+ sys.path.append(BUILD_DIR)
diff --git a/third_party/blink/tools/blinkpy/web_tests/skia_gold/blink_skia_gold_properties.py b/third_party/blink/tools/blinkpy/web_tests/skia_gold/blink_skia_gold_properties.py
new file mode 100644
index 0000000..8b15856
--- /dev/null
+++ b/third_party/blink/tools/blinkpy/web_tests/skia_gold/blink_skia_gold_properties.py
@@ -0,0 +1,27 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Blink implementation of //build/skia_gold_common/skia_gold_properties.py"""
+
+import subprocess
+import sys
+
+from blinkpy.common import path_finder
+from skia_gold_common import skia_gold_properties
+
+
+class BlinkSkiaGoldProperties(skia_gold_properties.SkiaGoldProperties):
+ @staticmethod
+ def _GetGitOriginMainHeadSha1():
+ try:
+ return subprocess.check_output(
+ ['git', 'rev-parse', 'origin/main'],
+ shell=_IsWin(),
+ cwd=path_finder.get_chromium_src_dir()).decode(
+ 'utf-8').strip()
+ except subprocess.CalledProcessError:
+ return None
+
+
+def _IsWin():
+ return sys.platform == 'win32'
diff --git a/third_party/blink/tools/blinkpy/web_tests/skia_gold/blink_skia_gold_session_manager.py b/third_party/blink/tools/blinkpy/web_tests/skia_gold/blink_skia_gold_session_manager.py
new file mode 100644
index 0000000..49583f6
--- /dev/null
+++ b/third_party/blink/tools/blinkpy/web_tests/skia_gold/blink_skia_gold_session_manager.py
@@ -0,0 +1,13 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Blink impl of //build/skia_gold_common/skia_gold_session_manager.py"""
+
+from skia_gold_common import output_managerless_skia_gold_session as omsgs
+from skia_gold_common import skia_gold_session_manager as sgsm
+
+
+class BlinkSkiaGoldSessionManager(sgsm.SkiaGoldSessionManager):
+ @staticmethod
+ def GetSessionClass():
+ return omsgs.OutputManagerlessSkiaGoldSession
\ No newline at end of file
