Permalink
Browse files

Merging from default

changeset:   2817:918e0544718c
parent:      2815:7c1d5441001c
user:        Rail Aliiev <rail@mozilla.com>
date:        Tue Nov 20 18:15:59 2012 -0500
summary:     Bug 813757 - Firefox and Thunderbird 17.0esr builds don't have en-US MAR file. r=nthomas

changeset:   2824:1704fd24b4cc
parent:      2817:918e0544718c
user:        John Hopkins <jhopkins@mozilla.com>
date:        Wed Nov 21 17:47:12 2012 -0500
summary:     Bug 814162 - sendchange fails on mock-enabled desktop release builders. r=kmoir

changeset:   2825:afb1205961f3
tag:         tip
user:        Ed Morley <emorley@mozilla.com>
date:        Wed Nov 21 23:37:50 2012 +0000
summary:     Bug 793782 - Stop appending redundant "buildbot.slave.commands.TimeoutError" string; r=bhearsum

--HG--
branch : production-0.8
  • Loading branch information...
2 parents b84633b + bbe857c commit 47ce87cea39cfdb9e4453a50e7302715a22d24f1 @ccooper ccooper committed Nov 22, 2012
Showing with 3 additions and 5 deletions.
  1. +2 −0 process/factory.py
  2. +1 −3 process/release.py
  3. +0 −2 steps/unittest.py
View
@@ -2796,6 +2796,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
user="sendchange",
comments=WithProperties('%(comments:-)s'),
sendchange_props=sendchange_props,
+ env=self.env,
))
for master, warn, retries in self.unittestMasters:
@@ -2811,6 +2812,7 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
user="sendchange-unittest",
comments=WithProperties('%(comments:-)s'),
sendchange_props=sendchange_props,
+ env=self.env,
))
class XulrunnerReleaseBuildFactory(ReleaseBuildFactory):
View
@@ -649,8 +649,6 @@ def getMessageId():
'multilocale_config', {}).get('platforms', {}).get(platform)
mozharnessMultiOptions = releaseConfig.get(
'multilocale_config', {}).get('multilocaleOptions')
- enableUpdatePackaging = bool(releaseConfig.get('verifyConfigs',
- {}).get(platform))
build_factory = ReleaseBuildFactory(
env=platform_env,
objdir=pf['platform_objdir'],
@@ -700,7 +698,7 @@ def getMessageId():
multiLocaleConfig=multiLocaleConfig,
mozharnessMultiOptions=mozharnessMultiOptions,
usePrettyNames=releaseConfig.get('usePrettyNames', True),
- enableUpdatePackaging=enableUpdatePackaging,
+ enableUpdatePackaging=True,
mozconfigBranch=releaseTag,
signingServers=getSigningServers(platform),
enableSigning=releaseConfig.get('enableSigningAtBuildTime', True),
View
@@ -370,8 +370,6 @@ def evaluateCommand(self, cmd):
for line in cmd.logs["stdio"].readlines(channel=HEADER):
if "command timed out" in line:
self.addCompleteLog('timeout',
- 'buildbot.slave.commands.TimeoutError: ' +
- line +
"TinderboxPrint: " + self.name + "<br/>" +
emphasizeFailureText("timeout") + "\n")
# We don't need to print a second error if we timed out

0 comments on commit 47ce87c

Please sign in to comment.