Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge default >> production

--HG--
branch : production-0.8
  • Loading branch information...
commit 6ceaeea6a7c8f08b77afbe99ab3dfba87921954e 2 parents 4d44410 + 6c3c35c
@lsblakk lsblakk authored
Showing with 25 additions and 27 deletions.
  1. +20 −22 misc.py
  2. +5 −5 process/factory.py
View
42 misc.py
@@ -762,29 +762,27 @@ def generateBranchObjects(config, name):
l10n_binaryURL += "-l10n"
nomergeBuilders.extend(l10n_builders)
- # This notifies all l10n related build objects to Mozilla-l10n
- if not config.get('disable_tinderbox_mail'):
- branchObjects['status'].append(TinderboxMailNotifier(
- fromaddr="bootstrap@mozilla.com",
- tree=config['l10n_tinderbox_tree'],
- extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
- relayhost="mail.build.mozilla.org",
- logCompression="gzip",
- builders=l10n_builders,
- binaryURL=l10n_binaryURL
- ))
+ branchObjects['status'].append(TinderboxMailNotifier(
+ fromaddr="bootstrap@mozilla.com",
+ tree=config['l10n_tinderbox_tree'],
+ extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
+ relayhost="mail.build.mozilla.org",
+ logCompression="gzip",
+ builders=l10n_builders,
+ binaryURL=l10n_binaryURL
+ ))
- # We only want the builds from the specified builders
- # since their builds have a build property called "locale"
- branchObjects['status'].append(TinderboxMailNotifier(
- fromaddr="bootstrap@mozilla.com",
- tree=WithProperties(config['l10n_tinderbox_tree'] + "-%(locale)s"),
- extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
- relayhost="mail.build.mozilla.org",
- logCompression="gzip",
- builders=l10n_builders,
- binaryURL=l10n_binaryURL
- ))
+ # We only want the builds from the specified builders
+ # since their builds have a build property called "locale"
+ branchObjects['status'].append(TinderboxMailNotifier(
+ fromaddr="bootstrap@mozilla.com",
+ tree=WithProperties(config['l10n_tinderbox_tree'] + "-%(locale)s"),
+ extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
+ relayhost="mail.build.mozilla.org",
+ logCompression="gzip",
+ builders=l10n_builders,
+ binaryURL=l10n_binaryURL
+ ))
# Log uploads for dep l10n repacks
branchObjects['status'].append(QueuedCommandHandler(
View
10 process/factory.py
@@ -1127,11 +1127,6 @@ def get_ctors(rc, stdout, stderr):
extract_fn=get_ctors,
))
- self.addStep(OutputStep(
- name='tinderboxprint_ctors',
- data=WithProperties('TinderboxPrint: num_ctors: %(num_ctors:-unknown)s'),
- ))
-
if self.graphServer:
self.addBuildInfoSteps()
self.addStep(JSONPropertiesDownload(slavedest="properties.json"))
@@ -1141,6 +1136,11 @@ def get_ctors(rc, stdout, stderr):
resultsname=self.baseName,
env={'PYTHONPATH': [WithProperties('%(toolsdir)s/lib/python')]},
propertiesFile="properties.json"))
+ else:
+ self.addStep(OutputStep(
+ name='tinderboxprint_ctors',
+ data=WithProperties('TinderboxPrint: num_ctors: %(num_ctors:-unknown)s'),
+ ))
def addLeakTestSteps(self):
leakEnv = self.env.copy()
Please sign in to comment.
Something went wrong with that request. Please try again.