git cl: get rid of builders-map.
Builders-map is finally no longer necessary.
R=smut
TBR=ehmaldonado
Bug: 570733
Change-Id: I05c3087c877fdccfd878bb9befff4fb77b92b26b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1779543
Commit-Queue: Andrii Shyshkalov <tandrii@google.com>
Reviewed-by: smut <smut@google.com>
Auto-Submit: Andrii Shyshkalov <tandrii@google.com>
diff --git a/git_cl.py b/git_cl.py
index d72410f..f8b1596 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -435,38 +435,11 @@
if options.bucket:
return {options.bucket: {b: [] for b in options.bot}}
if options.master:
+ print(
+ 'WARNING: "-m <master>" option is deprecated. Use -B <bucket> instead.')
return {_prefix_master(options.master): {b: [] for b in options.bot}}
-
- # If bots are listed but no master or bucket, then we need to find out
- # the corresponding master for each bot.
- bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
- if error_message:
- option_parser.error(
- 'Tryserver master cannot be found because: %s\n'
- 'Please manually specify the tryserver master, e.g. '
- '"-m tryserver.chromium.linux".' % error_message)
- return bucket_map
-
-
-def _get_bucket_map_for_builders(builders):
- """Returns a map of buckets to builders for the given builders."""
- map_url = 'https://builders-map.appspot.com/'
- try:
- builders_map = json.load(urllib2.urlopen(map_url))
- except urllib2.URLError as e:
- return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
- (map_url, e))
- except ValueError as e:
- return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
- if not builders_map:
- return None, 'Failed to build master map.'
-
- bucket_map = {}
- for builder in builders:
- bucket = builders_map.get(builder, {}).get('bucket')
- if bucket:
- bucket_map.setdefault(bucket, {})[builder] = []
- return bucket_map, None
+ option_parser.error(
+ 'Please specify the bucket, e.g. "-B luci.chromium.try".')
def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):