Skip to content
This repository has been archived by the owner on Jun 11, 2019. It is now read-only.

Commit

Permalink
Merge bug 625736, bug 613229, bug 607396 and bug 561442
Browse files Browse the repository at this point in the history 
--HG--
branch : production-0.8
  • Loading branch information
Armen Zambrano Gasparnian committed Jan 20, 2011
2 parents 541e644 + ac0ff59 commit ad61df0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
7 changes: 5 additions & 2 deletions misc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def mergeBuildObjects(d1, d2):
def generateTestBuilder(config, branch_name, platform, name_prefix,
build_dir_prefix, suites_name, suites,
mochitestLeakThreshold, crashtestLeakThreshold,
slaves=None, category=None):
slaves=None, resetHwClock=False, category=None):
builders = []
pf = config['platforms'].get(platform, {})
if slaves == None:
Expand Down Expand Up @@ -424,6 +424,7 @@ def generateTestBuilder(config, branch_name, platform, name_prefix,
chunkByDir=suites.get('chunkByDir'),
env=pf.get('unittest-env', {}),
downloadSymbols=pf.get('download_symbols', True),
resetHwClock=resetHwClock,
)
builder = {
'name': '%s %s-%i/%i' % (name_prefix, suites_name, i+1, totalChunks),
Expand Down Expand Up @@ -453,6 +454,7 @@ def generateTestBuilder(config, branch_name, platform, name_prefix,
buildsBeforeReboot=config['platforms'][platform]['builds_before_reboot'],
downloadSymbols=pf.get('download_symbols', True),
env=pf.get('unittest-env', {}),
resetHwClock=resetHwClock,
)
builder = {
'name': '%s %s' % (name_prefix, suites_name),
Expand Down Expand Up @@ -2420,7 +2422,8 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
"%s_%s_test" % (branch, slave_platform_name),
suites_name, suites, branch_config.get('mochitest_leak_threshold', None),
branch_config.get('crashtest_leak_threshold', None),
platform_config[slave_platform]['slaves']))
platform_config[slave_platform]['slaves'],
resetHwClock=branch_config['platforms'][platform][slave_platform].get('reset_hw_clock', False)))

for scheduler_name, test_builders, merge in triggeredUnittestBuilders:
for test in test_builders:
Expand Down
9 changes: 5 additions & 4 deletions process/factory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2604,8 +2604,8 @@ def tinderboxPrintBuildInfo(self):

def doUpload(self):
self.addStep(ShellCommand,
name='make_l10n_upload',
command=['make', WithProperties('l10n-upload-%(locale)s')],
name='make_upload',
command=['make', 'upload', WithProperties('AB_CD=%(locale)s')],
env=self.uploadEnv,
workdir='%s/%s/%s/locales' % (self.baseWorkDir, self.objdir,
self.appName),
Expand Down Expand Up @@ -6638,7 +6638,7 @@ def parse_sendchange_files(build, include_substr='', exclude_substrs=[]):
class MozillaTestFactory(MozillaBuildFactory):
def __init__(self, platform, productName='firefox',
downloadSymbols=True, downloadTests=False,
posixBinarySuffix='-bin', **kwargs):
posixBinarySuffix='-bin', resetHwClock=False, **kwargs):
#Note: the posixBinarySuffix is needed because some products (firefox)
#use 'firefox-bin' and some (fennec) use 'fennec' for the name of the
#actual application binary. This is only applicable to posix-like
Expand All @@ -6653,6 +6653,7 @@ def __init__(self, platform, productName='firefox',
self.posixBinarySuffix = posixBinarySuffix
self.downloadSymbols = downloadSymbols
self.downloadTests = downloadTests
self.resetHwClock = resetHwClock

assert self.platform in getSupportedPlatforms()

Expand Down Expand Up @@ -6852,7 +6853,7 @@ def addTearDownSteps(self):
if self.buildsBeforeReboot and self.buildsBeforeReboot > 0:
#This step is to deal with minis running linux that don't reboot properly
#see bug561442
if 'linux' in self.platform:
if self.resetHwClock and 'linux' in self.platform:
self.addStep(ShellCommand(
name='set_time',
description=['set', 'time'],
Expand Down
16 changes: 8 additions & 8 deletions process/release.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ def l10nBuilders(platform):
if not releaseConfig.get('skip_tag'):
pf = branchConfig['platforms']['linux']
tag_env = builder_env.copy()
if pf.get('HG_SHARE_BASE_DIR', None):
tag_env['HG_SHARE_BASE_DIR'] = pf['HG_SHARE_BASE_DIR']
if pf['env'].get('HG_SHARE_BASE_DIR', None):
tag_env['HG_SHARE_BASE_DIR'] = pf['env']['HG_SHARE_BASE_DIR']

tag_factory = ScriptFactory(
scriptRepo=tools_repo,
Expand Down Expand Up @@ -1058,7 +1058,7 @@ def l10nBuilders(platform):

#send a message when we receive the sendchange and start tagging
status.append(ChangeNotifier(
fromaddr="release@mozilla.org",
fromaddr="release@mozilla.com",
relayhost="mail.build.mozilla.org",
sendToInterestedUsers=False,
extraRecipients=releaseConfig['AllRecipients'],
Expand All @@ -1067,17 +1067,17 @@ def l10nBuilders(platform):
))
#send a message when signing is complete
status.append(ChangeNotifier(
fromaddr="release@mozilla.org",
fromaddr="release@mozilla.com",
relayhost="mail.build.mozilla.org",
sendToInterestedUsers=False,
extraRecipients=releaseConfig['AllRecipients'],
branches=[builderPrefix('post_signing')],
messageFormatter=createReleaseChangeMessage,
))

#send the nice(passing) release messages to release@m.o (for now)
#send the nice(passing) release messages
status.append(MailNotifier(
fromaddr='release@mozilla.org',
fromaddr='release@mozilla.com',
sendToInterestedUsers=False,
extraRecipients=releaseConfig['PassRecipients'],
mode='passing',
Expand All @@ -1086,9 +1086,9 @@ def l10nBuilders(platform):
messageFormatter=createReleaseMessage,
))

#send all release messages to release@m.o (for now)
#send all release messages
status.append(MailNotifier(
fromaddr='release@mozilla.org',
fromaddr='release@mozilla.com',
sendToInterestedUsers=False,
extraRecipients=releaseConfig['AllRecipients'],
mode='all',
Expand Down

0 comments on commit ad61df0

Please sign in to comment.