Bug 655765 - Move of aurora and beta repositories into /releases/ b branch detection for automation scripts. r=gmealer
authorHenrik Skupin <hskupin@mozilla.com>
Tue, 10 May 2011 10:17:11 +0200
changeset 51 7717ca680fcd
parent 50 841d6ccf0e70
child 52 6ed3a9a12d63
push id52
push userhskupin@mozilla.com
push date2011-05-10 08:17 +0000
reviewersgmealer
bugs655765
Bug 655765 - Move of aurora and beta repositories into /releases/ b branch detection for automation scripts. r=gmealer
libs/repository.py
--- a/libs/repository.py
+++ b/libs/repository.py
@@ -90,20 +90,25 @@ class Repository(object):
 
         print "*** Cloning repository to '%s'" % self.destination
         hg.clone(ui.ui(), self.url, self.destination, True)
         self._repository = hg.repository(ui.ui(), self.destination)
 
     def identify_branch(self, gecko_branch):
         """ Identify the mozmill-tests branch from the gecko branch. """
         m = re.search('(?<=-)([\S\.]+)', gecko_branch)
-    
+
         # Release builds have to be handled differently
         if re.match(r'.*/releases/.*', gecko_branch):
-            branch = 'mozilla' + m.group(0)
+            # Workaround for builds on the Aurora and Beta channel until we have
+            # found the right way to handle the branches in our test repository
+            if re.match(r'\D+', m.group(0)):
+                branch = m.group(0)
+            else:
+                branch = 'mozilla' + m.group(0)
         else:
             # Take the suffix except for Nightly builds which have to use
             # our default branch from the test repository
             branch = m.group(0).replace("central", "default")
 
         return branch
 
     def update(self, branch=None):