git cl try: omit triggered bots from cq.cfg default list

commit_queue.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Access the commit queue from the command line.
 """
 
 __version__ = '0.1'
 
@@ skipping 87 matching lines @@
   _apply_on_issue(_get_commit, obj, issue)
 
 def set_commit(obj, issue, flag):
   """Sets the commit bit flag on an issue."""
   def _set_commit(properties):
     print obj.set_flag(issue, properties['patchsets'][-1], 'commit', flag)
     return 0
   _apply_on_issue(_set_commit, obj, issue)
 
 
 def get_master_builder_map(config_path):

[tandrii(chromium), 2016/01/14 09:36:06]

how about adding here "include_experimental=True, include_triggered=True" so as
to produce same output for commit_queue command, but still allow git_cl.py to
filter them out?

[Michael Achenbach, 2016/01/14 09:56:04]

How about now?

   """Returns a map of master -> [builders] from cq config."""
   with open(config_path) as config_file:
     cq_config = config_file.read()
 
   config = cq_pb2.Config()
   text_format.Merge(cq_config, config)
   masters = {}
   if config.HasField('verifiers') and config.verifiers.HasField('try_job'):
     for bucket in config.verifiers.try_job.buckets:
       masters.setdefault(bucket.name, [])
       for builder in bucket.builders:
-        if not builder.HasField('experiment_percentage'):
+        if (not builder.HasField('experiment_percentage') and
+            not builder.HasField('triggered_by')):
           masters[bucket.name].append(builder.name)
   return masters
 
 
 @need_issue
 def CMDset(parser, args):
   """Sets the commit bit."""
   options, args, obj = parser.parse_args(args)
   if args:
     parser.error('Unrecognized args: %s' % ' '.join(args))
@@ skipping 137 matching lines @@
   return CMDhelp(parser, args)
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)