api.trigger: refactoring, made extensible

scripts/common/annotator.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Contains generating and parsing systems of the Chromium Buildbot Annotator.
 
 When executed as a script, this reads step name / command pairs from a file and
 executes those lines while annotating the output. The input is json:
 
@@ skipping 429 matching lines @@
   if isinstance(when, datetime.datetime):
     when = calendar.timegm(when.utctimetuple())
     change['when_timestamp'] = when
 
   return change
 
 
 def triggerBuilds(step, trigger_specs):
   assert trigger_specs is not None
   for trig in trigger_specs:
-    props = trig.get('properties')
-    if not props:
-      raise ValueError('Trigger spec: properties are missing')
-    builder_name = props.pop('buildername', None)
+    builder_name = trig.get('builder_name')
     if not builder_name:
-      raise ValueError('Trigger spec: buildername property is missing')
+      raise ValueError('Trigger spec: builder_name is not set')
 
-    changes = props.get('buildbot.changes', [])
+    changes = trig.get('buildbot_changes', [])
     assert isinstance(changes, list), 'buildbot.changes must be a list'

[smut, 2015/02/28 01:44:51]

buildbot.changes -> buildbot_changes

[nodir, 2015/03/02 02:26:10]

Done.

     changes = map(normalizeChange, changes)
 
     step.step_trigger(json.dumps({
         'builderNames': [builder_name],
         'changes': changes,
-        'properties': props,
+        'properties': trig.get('properties'),
     }, sort_keys=True))
 
 
 def run_step(stream, name, cmd,
              cwd=None, env=None,
              allow_subannotations=False,
              trigger_specs=None,
              **kwargs):
   """Runs a single step.
 
@@ skipping 192 matching lines @@
     steps.extend(json.load(sys.stdin, object_hook=force_dict_strs))
   else:
     with open(args[0], 'rb') as f:
       steps.extend(json.load(f, object_hook=force_dict_strs))
 
   return 1 if run_steps(steps, False)[0] else 0
 
 
 if __name__ == '__main__':
   sys.exit(main())