bug 611092 - trigger mobile unit tests for linux i686 builds r=aki
authorJohn Ford <jhford@mozilla.com>
Thu, 21 Apr 2011 11:04:26 -0700
changeset 1498 aafb13808c014b1542db105b81daf57021eb7de0
parent 1497 4955dd39866ef954efe5842bf698ca1e5bd7bebc
child 1499 c9ca9b57c061d859eddcae157c87e3fb0ab6a51d
child 1500 c5d45a4431bd758b3699b2bcd458ea729d58901a
push id1027
push userjford@mozilla.com
push dateThu, 21 Apr 2011 18:04:50 +0000
reviewersaki
bugs611092
bug 611092 - trigger mobile unit tests for linux i686 builds r=aki
process/factory.py
--- a/process/factory.py
+++ b/process/factory.py
@@ -6416,35 +6416,38 @@ class MobileBuildFactory(MozillaBuildFac
             workdir='%s/%s/%s' % (self.baseWorkDir, self.branchName,
                                   self.objdir),
             extract_fn = parse_make_upload,
             haltOnFailure=True,
             description=['make', 'upload'],
             timeout=40*60 # 40 minutes
         ))
         sendchangePlatform = None
-        if self.talosMasters:
-            if self.platform == 'android-r7':
-                sendchangePlatform = 'android'
-            if 'linux' in self.platform:
-                sendchangePlatform = 'linux'
-        if sendchangePlatform and sendchange:
+        if self.platform == 'android-r7':
+            sendchangePlatform = 'android'
+        if 'linux' in self.platform:
+            sendchangePlatform = 'linux'
+        if len(self.talosMasters) > 0 and sendchange:
             talosBranch = "%s-%s-talos" % (self.branchName, sendchangePlatform)
-            unittestBranch = "%s-%s-opt-unittest" % (self.branchName, sendchangePlatform)
             for master, warn, retries in self.talosMasters:
                 self.addStep(SendChangeStep(
                  name='sendchange_%s' % master,
                  warnOnFailure=warn,
                  master=master,
                  retries=retries,
                  branch=talosBranch,
                  revision=WithProperties("%(got_revision)s"),
                  files=[WithProperties('%(packageUrl)s')],
                  user="sendchange")
                 )
+        if len(self.unittestMasters) > 0 and sendchange:
+            unittestType = 'mobile' if 'linux' in self.platform else 'opt'
+            unittestBranch = "%s-%s-%s-unittest" % (self.branchName,
+                                                    sendchangePlatform,
+                                                    unittestType)
             for master, warn, retries in self.unittestMasters:
                 self.addStep(SendChangeStep(
                  name='sendchange_%s' % master,
                  warnOnFailure=warn,
                  master=master,
                  retries=retries,
                  branch=unittestBranch,
                  revision=WithProperties("%(got_revision)s"),
@@ -6482,17 +6485,18 @@ class MobileDesktopBuildFactory(MobileBu
 
         self.addPreCleanSteps()
         self.addBaseRepoSteps()
         self.getMozconfig()
         self.addPreBuildSteps()
         self.addBuildSteps()
         self.addPackageSteps()
         self.addSymbolSteps()
-        self.addMakeUploadSteps()
+        do_sendchange = True if 'linux' in self.platform else False
+        self.addMakeUploadSteps(sendchange=do_sendchange)
         if self.triggerBuilds:
             self.addTriggeredBuildsSteps()
         if self.buildsBeforeReboot and self.buildsBeforeReboot > 0:
             self.addPeriodicRebootSteps()
 
     def addPreCleanSteps(self):
         self.addStep(ShellCommand,
                 name='rm_cltbld_logs',