changeset: 2575:08ab818fd5a1

parent: 2570:93832dff28f6 user: Ed Morley <emorley@mozilla.com> date: Mon Sep 03 23:52:35 2012 +0100 summary: Bug 690672 - Disable coalescing for requests from self-serve; r=catlee --HG-- branch : production-0.8
mozilla-releng · Sep 5, 2012 · 7573733 · 7573733
2 parents e62b541 + d32c644
commit 7573733
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/misc.py b/misc.py
@@ -347,6 +347,9 @@ def _nextslave(builder, available_slaves):
 def mergeRequests(builder, req1, req2):
     if builder.name in nomergeBuilders:
         return False
+    if 'Self-serve' in req1.reason or 'Self-serve' in req2.reason:
+        # A build was explicitly requested on this revision, so don't coalesce it
+        return False
     return req1.canBeMergedWith(req2)
 
 def mergeBuildObjects(d1, d2):