Support multiple try masters when sending tries to rietveld.

rietveld.py

 # coding: utf-8
 # Copyright (c) 2012 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.
 """Defines class Rietveld to easily access a rietveld instance.
 
 Security implications:
 
 The following hypothesis are made:
 - Rietveld enforces:
@@ skipping 313 matching lines @@
         # It's an error message. Return as no result.
         break
       data = json.loads(output) or {}
       if not data.get('results'):
         break
       for i in data['results']:
         yield i
       cursor = '&cursor=%s' % data['cursor']
 
   def trigger_try_jobs(
-      self, issue, patchset, reason, clobber, revision, builders_and_tests):
+      self, issue, patchset, reason, clobber, revision, masters):

[Paweł Hajdan Jr., 2014/02/27 02:20:24]

CQ relies on trigger_try_jobs working the way it worked before.

If you're changing semantics, please add a new method and deprecate this one.

[Michael Achenbach, 2014/02/27 18:35:23]

Done. As soon as CQ is going to call the new method, we might need to collect
the return values. I don't know if the CQ actually reads those.

     """Requests new try jobs.
 
-    |builders_and_tests| is a map of builders: [tests] to run.
+    |masters| is a map of masters: map of builders: [tests] to run.
 
     Returns the keys of the new TryJobResult entites.
     """
-    params = [
-      ('reason', reason),
-      ('clobber', 'True' if clobber else 'False'),
-      ('builders', json.dumps(builders_and_tests)),
-      ('xsrf_token', self.xsrf_token()),
-    ]
-    if revision:
-      params.append(('revision', revision))
-    return self.post('/%d/try/%d' % (issue, patchset), params)
+    for (master, builders_and_tests) in masters.iteritems():
+      params = [
+        ('reason', reason),
+        ('clobber', 'True' if clobber else 'False'),
+        ('builders', json.dumps(builders_and_tests)),
+        ('xsrf_token', self.xsrf_token()),
+      ]
+      if revision:
+        params.append(('revision', revision))
+      if master:
+        # Temporarily allow empty master names for old configurations. The try
+        # job will not be associated with a master name on rietveld. This is
+        # going to be deprecated.
+        params.append(('master', master))
+      self.post('/%d/try/%d' % (issue, patchset), params)
 
   def get_pending_try_jobs(self, cursor=None, limit=100):
     """Retrieves the try job requests in pending state.
 
     Returns a tuple of the list of try jobs and the cursor for the next request.
     """
     url = '/get_pending_try_patchsets?limit=%d' % limit
     extra = ('&cursor=' + cursor) if cursor else ''
     data = json.loads(self.get(url + extra))
     return data['jobs'], data['cursor']
@@ skipping 172 matching lines @@
                   add_as_reviewer=False):
     logging.info('ReadOnlyRietveld: posting comment "%s" to issue %d' %
         (message, issue))
 
   def set_flag(self, issue, patchset, flag, value):  # pylint:disable=R0201
     logging.info('ReadOnlyRietveld: setting flag "%s" to "%s" for issue %d' %
         (flag, value, issue))
     ReadOnlyRietveld._local_changes.setdefault(issue, {})[flag] = value
 
   def trigger_try_jobs(  # pylint:disable=R0201
-      self, issue, patchset, reason, clobber, revision, builders_and_tests):
+      self, issue, patchset, reason, clobber, revision, masters):
     logging.info('ReadOnlyRietveld: triggering try jobs %r for issue %d' %
-        (builders_and_tests, issue))
+        (masters, issue))