Skip to content

Commit

Permalink
[M102][infra] Create test specs for linux-blink-rel-dummy try builders.
Browse files Browse the repository at this point in the history
The linux-blink-rel-dummy builder does not actually exist. Mirroring
non-existent builders is not supported with src-side configs, so in
order to migrate the config for linux-blink-rel, it needs to be made
into a standalone try builder. v8_linux_blink_rel won't be able to share
the config with linux-blink-rel since it won't be able to mirror
linux-blink-rel in order to read its source side spec, so it is also
being made into a standalone try builder.

(cherry picked from commit b989592)

Bug: 1317387
Change-Id: Id4b0944676869f081ebc5c5018f717fc8afc67e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3591732
Auto-Submit: Garrett Beaty <gbeaty@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#993479}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3594604
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#32}
Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
  • Loading branch information
kleerwater authored and Chromium LUCI CQ committed Apr 19, 2022
1 parent 38861fb commit 16e7d39
Show file tree
Hide file tree
Showing 4 changed files with 159 additions and 1 deletion.
4 changes: 3 additions & 1 deletion testing/buildbot/generate_buildbot_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -1636,7 +1636,9 @@ def check_input_file_consistency(self, verbose=False):
if bot_name in builders_that_dont_exist:
continue # pragma: no cover
if bot_name not in bot_names:
if waterfall['name'] in ['client.v8.chromium', 'client.v8.fyi']:
if waterfall['name'] in [
'client.v8.chromium', 'client.v8.fyi', 'tryserver.v8'
]:
# TODO(thakis): Remove this once these bots move to luci.
continue # pragma: no cover
if waterfall['name'] in ['tryserver.webrtc',
Expand Down
63 changes: 63 additions & 0 deletions testing/buildbot/tryserver.blink.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"linux-blink-rel": {
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"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,
"dimension_sets": [
{
"os": "Ubuntu-18.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
{
"isolate_name": "webdriver_wpt_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webdriver_tests_suite",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-18.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webdriver_wpt_tests/"
}
]
}
}
63 changes: 63 additions & 0 deletions testing/buildbot/tryserver.v8.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"v8_linux_blink_rel": {
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"--git-revision=${got_revision}"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"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,
"dimension_sets": [
{
"os": "Ubuntu-18.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
{
"isolate_name": "webdriver_wpt_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webdriver_tests_suite",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-18.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:webdriver_wpt_tests/"
}
]
}
}
30 changes: 30 additions & 0 deletions testing/buildbot/waterfalls.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -6738,6 +6738,21 @@
},
},
},
{
'name': 'tryserver.blink',
'mixins': ['chromium-tester-service-account'],
'machines': {
# Should be kept in sync with v8_linux_blink_rel in tryserver.v8
'linux-blink-rel': {
'mixins': [
'linux-bionic',
],
'test_suites': {
'isolated_scripts': 'chromium_web_tests_and_wpt_webdriver_isolated_scripts',
},
},
},
},
{
'name': 'tryserver.chromium.android',
'mixins': ['chromium-tester-service-account'],
Expand Down Expand Up @@ -6832,6 +6847,21 @@
},
}
},
{
'name': 'tryserver.v8',
'mixins': ['chromium-tester-service-account'],
'machines': {
# Should be kept in sync with linux-blink-rel in tryserver.blink
'v8_linux_blink_rel': {
'mixins': [
'linux-bionic',
],
'test_suites': {
'isolated_scripts': 'chromium_web_tests_and_wpt_webdriver_isolated_scripts',
},
},
},
},
{
'name': 'tryserver.webrtc',
'mixins': ['chromium-tester-service-account'],
Expand Down

0 comments on commit 16e7d39

Please sign in to comment.