Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge bugs 704028 and 697802 to production-0.8 branch

--HG--
branch : production-0.8
  • Loading branch information...
commit fda579b0c3e7218812bb9cae61afdb1652fbdba8 2 parents 91deaf7 + 17022d5
@bhearsum bhearsum authored
Showing with 16 additions and 4 deletions.
  1. +4 −2 process/factory.py
  2. +12 −2 steps/misc.py
View
6 process/factory.py
@@ -4245,7 +4245,8 @@ def __init__(self, productName, version, baseTag, stagingServer,
self.bundleFile],
workdir='.',
description=['create bundle'],
- haltOnFailure=True
+ haltOnFailure=True,
+ timeout=30*60 # 30 minutes
))
self.addStep(ShellCommand(
name='delete_metadata',
@@ -4269,7 +4270,8 @@ def __init__(self, productName, version, baseTag, stagingServer,
workdir="%s/%s" % (self.mozillaSrcDir, self.mozillaObjdir),
env=self.env,
description=['make source-package'],
- haltOnFailure=True
+ haltOnFailure=True,
+ timeout=30*60 # 30 minutes
))
self.addStep(ShellCommand(
name='mv_source-package',
View
14 steps/misc.py
@@ -41,6 +41,7 @@
from buildbotcustom.steps.base import LoggingBuildStep, ShellCommand, \
addRetryEvaluateCommand, RetryingShellCommand
from buildbotcustom.common import genBuildID, genBuildUID
+from buildbotcustom.try_parser import processMessage
def errbackAfter(wrapped_d, timeout):
# Thanks to Dustin!
@@ -404,8 +405,17 @@ def start(self):
bb_cmd = ['buildbot', 'sendchange', '--master', self.master,
'--username', user, '--branch', branch,
'--revision', revision]
- if comments:
- bb_cmd.extend(['--comments', comments])
+ if isinstance(comments, basestring):
+ if re.search('try: ', comments, re.MULTILINE):
+ comments = 'try: ' + ' '.join(processMessage(comments))
+ else:
+ try:
+ comments = comments.splitlines()[0]
+ except IndexError:
+ comments = ''
+ comments = re.sub(r'[\r\n^<>|;&"\'%$]', '_', comments)
+ if comments:
+ bb_cmd.extend(['--comments', comments])
for key, value in sendchange_props:
bb_cmd.extend(['--property', '%s:%s' % (key, value)])
Please sign in to comment.
Something went wrong with that request. Please try again.