Merge from default

changeset: 2288:1f4bfc30a92b tag: tip parent: 2286:03c085f326cc user: John Hopkins <jhopkins@mozilla.com> date: Mon Apr 30 15:14:44 2012 -0400 summary: Bug 750305 - Use comm-central as reference branch for try-comm-central builds. r=rail --HG-- branch : production-0.8
mozilla-releng · Apr 30, 2012 · 13b8e62 · 13b8e62
2 parents 75f91d0 + e1d4ca1
commit 13b8e62
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/process/factory.py b/process/factory.py
@@ -1953,6 +1953,10 @@ def __init__(self,talosMasters=None, unittestMasters=None, packageUrl=None,
 
         self.tinderboxBuildsDir = tinderboxBuildsDir
 
+        self.codeSighsReferenceRepo = 'mozilla-central'
+        if 'thunderbird' in kwargs['stageProduct']:
+            self.codeSighsReferenceRepo = 'comm-central'
+
         MercurialBuildFactory.__init__(self, **kwargs)
 
     def addSourceSteps(self):
@@ -2018,8 +2022,8 @@ def addLeakTestSteps(self):
         leakEnv = self.env.copy()
         leakEnv['MINIDUMP_STACKWALK'] = getPlatformMinidumpPath(self.platform)
         leakEnv['MINIDUMP_SAVE_PATH'] = WithProperties('%(basedir:-)s/minidumps')
-        baseUrl = 'http://%s/pub/mozilla.org/%s/tinderbox-builds/mozilla-central-%s' % \
-            (self.stageServer, self.productName, self.complete_platform)
+        baseUrl = 'http://%s/pub/mozilla.org/%s/tinderbox-builds/%s-%s' % \
+            (self.stageServer, self.productName, self.codeSighsReferenceRepo, self.complete_platform)
         self.addLeakTestStepsCommon(baseUrl, leakEnv, False)
 
     def addCodesighsSteps(self):
@@ -2031,8 +2035,8 @@ def addCodesighsSteps(self):
         self.addStep(RetryingShellCommand(
          name='get_codesize_log',
          command=['wget', '-O', 'codesize-auto-old.log',
-         'http://%s/pub/mozilla.org/%s/tinderbox-builds/mozilla-central-%s/codesize-auto.log' % \
-           (self.stageServer, self.productName, self.platform)],
+         'http://%s/pub/mozilla.org/%s/tinderbox-builds/%s-%s/codesize-auto.log' % \
+           (self.stageServer, self.productName, self.codeSighsReferenceRepo, self.platform)],
          workdir='.',
          env=self.env
         ))