Merging from default

changeset:   4195:b63222955c94
tag:         tip
parent:      4191:785722efec9b
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Fri Apr 17 13:08:34 2015 -0400
summary:     bug 1153242: update verify fails for first few beta releases after RC - add support for passing mar channel ids to patcher config bumper. r=nthomas

--HG--
branch : production-0.8

process/factory.py

@@ -3903,7 +3903,7 @@ def __init__(self, patcherConfig, verifyConfigs, appName, productName,
                  buildSpace=2, triggerSchedulers=None, releaseNotesUrl=None,
                  python='python', promptWaitTime=None,
                  balrog_api_root=None, balrog_credentials_file=None,
-                 balrog_username=None, **kwargs):
+                 balrog_username=None, mar_channel_ids=[], **kwargs):
         ReleaseFactory.__init__(self, buildSpace=buildSpace, **kwargs)
 
         self.patcherConfig = patcherConfig
@@ -3929,6 +3929,7 @@ def __init__(self, patcherConfig, verifyConfigs, appName, productName,
         self.balrog_username = balrog_username
         self.testChannel = localTestChannel
         self.releaseChannel = releaseChannel
+        self.mar_channel_ids = mar_channel_ids
 
         self.previousVersion = getPreviousVersion(self.version,
                                                   self.partialUpdates.keys())
@@ -3968,6 +3969,8 @@ def bumpConfigs(self):
             bumpCommand.extend(['--platform', platform])
         if self.promptWaitTime:
             bumpCommand.extend(['--prompt-wait-time', self.promptWaitTime])
+        for c in self.mar_channel_ids:
+            bumpCommand.extend(["--mar-channel-id", c])
         if self.releaseNotesUrl:
             rnurl = self.releaseNotesUrl
             if self.use_mock:

process/release.py

@@ -1264,6 +1264,7 @@ def getMessageId():
             balrog_api_root=balrog_api_root,
             balrog_username=balrog_username,
             balrog_credentials_file=balrog_credentials_file,
+            mar_channel_ids=updateConfig.get("marChannelIds", []),
         )
 
         builderName = builderPrefix("%s_%s_updates" % (releaseConfig["productName"], channel))