Commit 6269d30f authored by Dirk Pranke's avatar Dirk Pranke Committed by Commit Bot

Revert 'infra: Generate source side spec by bucket'.

This CL reverts f60eb053
from March of this year; we were generating the big
//testing/buildbot/*.{ci,try}.json files that combined
all of the different buckets/masters, but we weren't
using the files. By reverting the change this reduces
the churn in the repo (and in CLs).

Bug: 1028719
Change-Id: If394897d072836d744f7cd72a2b2b6deb8e06f9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2441651Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#812469}
parent 63c8917e
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"android-opus-arm-rel": {
"gtest_tests": [
{
"args": [
"--shard-timeout=3000",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"opus_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "opus_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY48M",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "opus_tests",
"test_id_prefix": "ninja://third_party/opus:opus_tests/"
}
]
},
"android_blink_rel": {
"gtest_tests": [
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"blink_heap_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY48M",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "blink_heap_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/platform/heap:blink_heap_unittests/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webkit_unit_tests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "webkit_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY48M",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "blink_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
}
],
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"--release",
"--android",
"--disable-breakpad",
"--additional-driver-flag=--use-gpu-in-tests"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "LMY48M",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
}
]
},
"linux-autofill-assistant": {
"additional_compile_targets": [
"browser_tests"
]
},
"linux-layout-tests-edit-ng": {
"additional_compile_targets": [
"blink_tests"
],
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"--additional-driver-flag=--enable-blink-features=EditingNG"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
}
]
},
"linux-layout-tests-fragment-item": {
"additional_compile_targets": [
"blink_tests"
],
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"--additional-driver-flag=--enable-blink-features=LayoutNGFragmentItem"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
}
]
}
}
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"DevTools Linux": {
"additional_compile_targets": [
"blink_tests"
],
"gtest_tests": [
{
"args": [
"--disable-blink-features=LayoutNG"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "webkit_unit_tests_ng",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "blink_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
},
{
"args": [
"--gtest_filter=*DevTools*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "devtools_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
}
],
"isolated_scripts": [
{
"args": [
"--num-retries=3"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
{
"args": [
"--num-retries=3",
"--layout-tests-directory=../../third_party/devtools-frontend/src/test/webtests/",
"http/tests/devtools"
],
"isolate_name": "devtools_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_from_devtools",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:devtools_web_tests/"
}
]
},
"DevTools Linux (chromium)": {
"additional_compile_targets": [
"blink_tests"
],
"gtest_tests": [
{
"args": [
"--disable-blink-features=LayoutNG"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "webkit_unit_tests_ng",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "blink_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
}
],
"isolated_scripts": [
{
"args": [
"--num-retries=3"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
{
"args": [
"--num-retries=3",
"--layout-tests-directory=../../third_party/devtools-frontend/src/test/webtests/",
"http/tests/devtools"
],
"isolate_name": "devtools_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_from_devtools",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:devtools_web_tests/"
}
]
}
}
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"devtools_frontend_linux_blink_light_rel": {
"gtest_tests": [
{
"args": [
"--gtest_filter=*DevTools*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "devtools_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
}
],
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"http/tests/devtools"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
{
"args": [
"--num-retries=3",
"--layout-tests-directory=../../third_party/devtools-frontend/src/test/webtests/",
"http/tests/devtools"
],
"isolate_name": "devtools_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_from_devtools",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:devtools_web_tests/"
}
]
},
"devtools_frontend_linux_blink_rel": {
"isolated_scripts": [
{
"args": [
"--num-retries=3"
],
"isolate_name": "blink_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "blink_web_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://:blink_web_tests/"
},
{
"args": [
"--num-retries=3",
"--layout-tests-directory=../../third_party/devtools-frontend/src/test/webtests/",
"http/tests/devtools"
],
"isolate_name": "devtools_web_tests",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_from_devtools",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test_id_prefix": "ninja://:devtools_web_tests/"
}
]
}
}
......@@ -1311,7 +1311,7 @@ class BBJSONGenerator(object):
filters = self.args.waterfall_filters
result = collections.defaultdict(dict)
required_fields = ('project', 'bucket', 'name')
required_fields = ('name',)
for waterfall in self.waterfalls:
for field in required_fields:
# Verify required fields
......@@ -1326,12 +1326,6 @@ class BBJSONGenerator(object):
all_tests = self.generate_output_tests(waterfall)
result[waterfall['name']] = all_tests
# Deduce per-bucket mappings
# This will be the standard after masternames are gone
bucket_filename = waterfall['project'] + '.' + waterfall['bucket']
for buildername in waterfall['machines'].keys():
result[bucket_filename][buildername] = all_tests[buildername]
# Add do not edit warning
for tests in result.values():
tests['AAAAA1 AUTOGENERATED FILE DO NOT EDIT'] = {}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -10,8 +10,6 @@
[
{
'project': 'chrome',
'bucket': 'ci',
'name': 'chrome',
'mixins': ['chrome-tester-service-account'],
'machines': {
......@@ -410,8 +408,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -514,8 +510,6 @@
}
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.android',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -1046,8 +1040,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.android.fyi',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -1088,8 +1080,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.chromiumos',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -1228,8 +1218,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.clang',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -1670,8 +1658,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.dawn',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -1876,8 +1862,6 @@
}
},
{
'project': 'chrome',
'bucket': 'ci',
'name': 'chromium.dev',
'mixins': ['chromium-tester-dev-service-account'],
'machines': {
......@@ -1944,8 +1928,6 @@
},
},
{
'project': 'devtools-frontend',
'bucket': 'ci',
'name': 'chromium.devtools-frontend',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -1962,8 +1944,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.fuzz',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -2055,8 +2035,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.fyi',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -2828,8 +2806,6 @@
},
},
{
'project': 'chromium',
'bucket': 'goma',
'name': 'chromium.goma',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -2970,8 +2946,6 @@
},
},
{
'project': 'chromium',
'bucket': 'goma',
'name': 'chromium.goma.fyi',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -3178,8 +3152,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.gpu',
'forbid_script_tests': True,
'mixins': [
......@@ -3330,8 +3302,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.gpu.fyi',
'forbid_script_tests': True,
'mixins': [
......@@ -4423,8 +4393,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.linux',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -4621,8 +4589,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.mac',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -4781,8 +4747,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.memory',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -4939,8 +4903,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.mojo',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5002,8 +4964,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.swangle',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5197,8 +5157,6 @@
},
},
{
'project': 'chromium',
'bucket': 'webrtc',
'name': 'chromium.webrtc',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5258,8 +5216,6 @@
},
},
{
'project': 'chromium',
'bucket': 'webrtc.fyi',
'name': 'chromium.webrtc.fyi',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5373,8 +5329,6 @@
},
},
{
'project': 'chromium',
'bucket': 'ci',
'name': 'chromium.win',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5462,8 +5416,6 @@
},
},
{
'project': 'devtools-frontend',
'bucket': 'ci',
'name': 'client.devtools-frontend.integration',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5480,8 +5432,6 @@
},
},
{
'project': 'openscreen',
'bucket': 'ci',
'name': 'client.openscreen.chromium',
'machines': {
'chromium_linux64_debug': {
......@@ -5519,14 +5469,10 @@
},
},
{
'project': 'v8',
'bucket': 'ci',
'name': 'client.v8.branches',
'machines': {},
},
{
'project': 'v8',
'bucket': 'ci',
'name': 'client.v8.chromium',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5556,8 +5502,6 @@
},
},
{
'project': 'v8',
'bucket': 'ci',
'name': 'client.v8.fyi',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5830,8 +5774,6 @@
},
},
{
'project': 'chromium',
'bucket': 'try',
'name': 'tryserver.chromium.android',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5859,8 +5801,6 @@
},
},
{
'project': 'chromium',
'bucket': 'try',
'name': 'tryserver.chromium.linux',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5897,8 +5837,6 @@
},
},
{
'project': 'devtools-frontend',
'bucket': 'try',
'name': 'tryserver.devtools-frontend',
'mixins': ['chromium-tester-service-account'],
'machines': {
......@@ -5922,8 +5860,6 @@
}
},
{
'project': 'webrtc',
'bucket': 'try',
'name': 'tryserver.webrtc',
'mixins': ['chromium-tester-service-account'],
'machines': {
......
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"android_chromium_compile": {
"additional_compile_targets": [
"blink_unittests",
"capture_unittests",
"content_browsertests",
"content_unittests",
"jingle_unittests",
"remoting_unittests"
]
},
"linux_chromium_compile": {
"additional_compile_targets": [
"blink_unittests",
"browser_tests",
"capture_unittests",
"content_browsertests",
"content_unittests",
"jingle_unittests",
"remoting_unittests"
]
},
"linux_chromium_compile_dbg": {
"additional_compile_targets": [
"blink_unittests",
"browser_tests",
"capture_unittests",
"content_browsertests",
"content_unittests",
"jingle_unittests",
"remoting_unittests"
]
},
"mac_chromium_compile": {
"additional_compile_targets": [
"blink_unittests",
"browser_tests",
"capture_unittests",
"content_browsertests",
"content_unittests",
"jingle_unittests",
"remoting_unittests"
]
},
"win_chromium_compile": {
"additional_compile_targets": [
"blink_unittests",
"browser_tests",
"capture_unittests",
"content_browsertests",
"content_unittests",
"jingle_unittests",
"remoting_unittests"
]
},
"win_chromium_compile_dbg": {
"additional_compile_targets": [
"blink_unittests",
"browser_tests",
"capture_unittests",
"content_browsertests",
"content_unittests",
"jingle_unittests",
"remoting_unittests"
]
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment