| Index: masters/master.chromium.fyi/master.cfg
|
| diff --git a/masters/master.chromium.fyi/master.cfg b/masters/master.chromium.fyi/master.cfg
|
| index f7a301e58f2ba727fd434f2a8b581610ebd402b7..e50bd19bedaec264c5306cc712f14270052f0e17 100644
|
| --- a/masters/master.chromium.fyi/master.cfg
|
| +++ b/masters/master.chromium.fyi/master.cfg
|
| @@ -30,12 +30,8 @@ from master.factory import remote_run_factory
|
| import config
|
| import master_site_config
|
|
|
| -import master_win_drmemory_cfg
|
| -
|
| ActiveMaster = master_site_config.ChromiumFYI
|
|
|
| -DRMEMORY_NOTIFIER = True
|
| -
|
| STATUS_PUSH = False
|
|
|
| # This is the dictionary that the buildmaster pays attention to. We also use
|
| @@ -285,9 +281,6 @@ chromium_rel_archive = master_config.GetGSUtilUrl(
|
| chromium_dbg_archive = master_config.GetGSUtilUrl(
|
| 'chromium-build-transfer', 'Chromium FYI Builder (dbg)')
|
|
|
| -chromium_windows_drmemory_archive = master_config.GetGSUtilUrl(
|
| - 'chromium-build-transfer', 'drm-cr')
|
| -
|
| chromium_android_fyi_dbg_archive = master_config.GetGSUtilUrl(
|
| 'chromium-fyi-archive', 'chromium.fyi/Android Builder (dbg)')
|
|
|
| @@ -1398,8 +1391,6 @@ c['builders'].extend([
|
| },
|
| ])
|
|
|
| -master_win_drmemory_cfg.Update(config, ActiveMaster, c)
|
| -
|
| # Associate the slaves to the manual builders. The configuration is in
|
| # slaves.cfg.
|
| slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumFYI')
|
| @@ -1439,44 +1430,6 @@ if STATUS_PUSH:
|
| c['status'].append(HttpStatusPush(
|
| 'http://craebuild.appspot.com/status-listener'))
|
|
|
| -if DRMEMORY_NOTIFIER:
|
| - categories_steps = {
|
| - 'memory_tester': [
|
| - 'memory test: gcm_unit_tests',
|
| - 'memory test: printing',
|
| - 'memory test: media',
|
| - 'memory test: remoting',
|
| - 'memory test: sql',
|
| - 'memory test: sync',
|
| - 'memory test: ipc_tests',
|
| - 'memory test: base_unittests',
|
| - 'memory test: content',
|
| - 'memory test: crypto',
|
| - 'memory test: net',
|
| - 'memory test: ui_base_unittests',
|
| - 'memory test: unit', # unit_tests can be sharded
|
| - 'memory test: unit_1',
|
| - 'memory test: unit_2',
|
| - 'memory test: url_unittests',
|
| - ],
|
| - }
|
| - c['status'].append(failures_notifier.FailuresNotifier(
|
| - fromaddr=ActiveMaster.from_address,
|
| - categories_steps=categories_steps,
|
| - exclusions={},
|
| - relayhost=config.Master.smtp,
|
| - status_header='New DrMemory failure on "%(builder)s":\n%(steps)s',
|
| - subject='drmemory buildbot %(result)s in %(projectName)s on '
|
| - '%(builder)s, revision %(revision)s',
|
| - sendToInterestedUsers=False, # don't send e-mails to the committers.
|
| - extraRecipients=[
|
| - 'bruening+drmfyifailure@google.com',
|
| - 'zhaoqin+drmfyifailure@google.com',
|
| - ],
|
| - lookup=master_utils.FilterDomain(),
|
| - forgiving_steps=[],
|
| - use_getname=True))
|
| -
|
| c['status'].append(failures_notifier.FailuresNotifier(
|
| fromaddr=ActiveMaster.from_address, # Reply-To address
|
| mode='failing',
|
|
|