Revert 'infra: Generate source side spec by bucket'.
This CL reverts f60eb053fe03c1896e1abefb5b1da64daf450371
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/+/2441651
Reviewed-by: Stephen Martinis <[email protected]>
Commit-Queue: Dirk Pranke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#812469}
diff --git a/testing/buildbot/generate_buildbot_json.py b/testing/buildbot/generate_buildbot_json.py
index 371cde0e..5975cdd 100755
--- a/testing/buildbot/generate_buildbot_json.py
+++ b/testing/buildbot/generate_buildbot_json.py
@@ -1311,7 +1311,7 @@
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 @@
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'] = {}
