Bug 617188 - updater parameters in update_verify should be changed according to the new syntax. r=nthomas
authorRail Aliev <rail@mozilla.com>
Tue, 07 Dec 2010 22:43:37 +0200
changeset 1137 4febe8d47e48946fe874142f176efa06ddfbf565
parent 1136 59f35f922f09c915ac8ff3cd75afa1f1bbd25f47
child 1138 6143ef252d9c6310cfaed724147dc057c0dceda8
child 1139 8e54c659caf489c88176735de807726dffd878a0
push id748
push userraliiev@mozilla.com
push dateTue, 07 Dec 2010 20:59:44 +0000
reviewersnthomas
bugs617188
Bug 617188 - updater parameters in update_verify should be changed according to the new syntax. r=nthomas
process/factory.py
process/release.py
--- a/process/factory.py
+++ b/process/factory.py
@@ -4538,21 +4538,25 @@ class MajorUpdateFactory(ReleaseUpdatesF
 
     def getSnippetDir(self):
         date = strftime('%Y%m%d')
         return '%s-%s-%s-%s-MU' % (date, self.brandName, self.oldVersion,
                                    self.version)
 
 
 class UpdateVerifyFactory(ReleaseFactory):
-    def __init__(self, verifyConfig, buildSpace=.3, **kwargs):
+    def __init__(self, verifyConfig, buildSpace=.3, useOldUpdater=False,
+                 **kwargs):
         ReleaseFactory.__init__(self, repoPath='nothing',
                                 buildSpace=buildSpace, **kwargs)
+        command=['bash', 'verify.sh', '-c', verifyConfig]
+        if useOldUpdater:
+            command.append('--old-updater')
         self.addStep(UpdateVerify,
-         command=['bash', 'verify.sh', '-c', verifyConfig],
+         command=command,
          workdir='tools/release/updates',
          description=['./verify.sh', verifyConfig]
         )
 
 
 class ReleaseFinalVerification(ReleaseFactory):
     def __init__(self, verifyConfigs, **kwargs):
         # MozillaBuildFactory needs the 'repoPath' argument, but we don't
--- a/process/release.py
+++ b/process/release.py
@@ -745,16 +745,17 @@ def generateReleaseBranchObjects(release
 
 
     for platform in sorted(releaseConfig['verifyConfigs'].keys()):
         update_verify_factory = UpdateVerifyFactory(
             hgHost=branchConfig['hghost'],
             buildToolsRepoPath=branchConfig['build_tools_repo_path'],
             verifyConfig=releaseConfig['verifyConfigs'][platform],
             clobberURL=branchConfig['base_clobber_url'],
+            useOldUpdater=branchConfig['use_old_updater'],
         )
 
         builders.append({
             'name': builderPrefix('%s_update_verify' % platform),
             'slavenames': branchConfig['platforms'][platform]['slaves'],
             'category': builderPrefix(''),
             'builddir': builderPrefix('%s_update_verify' % platform),
             'factory': update_verify_factory,
@@ -832,16 +833,17 @@ def generateReleaseBranchObjects(release
         })
 
         for platform in sorted(releaseConfig['majorUpdateVerifyConfigs'].keys()):
             major_update_verify_factory = UpdateVerifyFactory(
                 hgHost=branchConfig['hghost'],
                 buildToolsRepoPath=branchConfig['build_tools_repo_path'],
                 verifyConfig=releaseConfig['majorUpdateVerifyConfigs'][platform],
                 clobberURL=branchConfig['base_clobber_url'],
+                useOldUpdater=branchConfig['use_old_updater'],
             )
 
             builders.append({
                 'name': builderPrefix('%s_major_update_verify' % platform),
                 'slavenames': branchConfig['platforms'][platform]['slaves'],
                 'category': builderPrefix(''),
                 'builddir': builderPrefix('%s_major_update_verify' % platform),
                 'factory': major_update_verify_factory,