Merging from default

changeset:   2524:bfe0f5a57d3e
parent:      2520:69bea3f55a3a
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Aug 23 08:59:21 2012 -0400
summary:     bug 784744: increase the number of update verify chunks. r=rail,nthomas

changeset:   2525:86c4b028de8c
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Aug 23 10:19:28 2012 -0400
summary:     bug 784798: tuxedo poller broken w/ multiple partials. r=rail

changeset:   2526:50b2cda3d5b4
tag:         tip
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Thu Aug 23 17:10:55 2012 -0400
summary:     Bug 785066 - make tier_base instead of tier_nspr - r=Callek

--HG--
branch : production-0.8

process/factory.py

@@ -3567,7 +3567,7 @@ def makePartialTools(self):
             name='make_bsdiff',
             command=['sh', '-c',
                      'if [ ! -e dist/host/bin/mbsdiff ]; then ' +
-                     'make tier_nspr; make -C config;' +
+                     'make tier_base; make -C config;' +
                      'make -C modules/libmar; make -C modules/libbz2;' +
                      'make -C other-licenses/bsdiff;'
                      'fi'],
@@ -3583,10 +3583,10 @@ def getCompleteMarPatternMatch(self):
 
     def doRepack(self):
         self.addStep(ShellCommand(
-         name='make_tier_nspr',
-         command=['make', 'tier_nspr'],
+         name='make_tier_base',
+         command=['make', 'tier_base'],
          workdir='%s/%s' % (self.baseWorkDir, self.mozillaObjdir),
-         description=['make tier_nspr'],
+         description=['make tier_base'],
          haltOnFailure=True
         ))
         if self.l10nNightlyUpdate:

process/release.py

@@ -45,7 +45,7 @@
 from release.info import getRuntimeTag, getReleaseTag
 import BuildSlaves
 
-DEFAULT_PARALLELIZATION = 3
+DEFAULT_PARALLELIZATION = 6
 
 def generateReleaseBranchObjects(releaseConfig, branchConfig,
                                  releaseConfigFile, sourceRepoKey="mozilla",

scheduler.py

@@ -315,7 +315,7 @@ def poll(self):
             bouncerProductName=bouncerProductName,
             version=self.release_config.get('version'),
             platforms=self.release_config.get('enUSPlatforms'),
-            oldVersion=self.release_config.get('oldVersion'),
+            partialVersions=self.release_config.get('partialUpdates').keys(),
             checkMARs=self.checkMARs,
             username=self.username,
             password=self.password)