bug 514070 (max dirty profile testing) patch for production/try p=anodelman, r=catlee
authorAlice Nodelman <alice@mozilla.com>
Thu, 10 Sep 2009 09:14:36 -0700
changeset 1489 e095d2e1a3447c87a62c1f18d88615ae9483b8b1
parent 1488 4919ef2ebb65b470c83052d03b29b766dad472df
child 1491 522eef98887fbc53ddbab9944e9ad6ddf8d8532f
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewerscatlee
bugs514070
bug 514070 (max dirty profile testing) patch for production/try p=anodelman, r=catlee
talos-pool/config.py
talos-pool/master.cfg
talos-try/config.py
--- a/talos-pool/config.py
+++ b/talos-pool/config.py
@@ -3,18 +3,18 @@ from buildbot.steps.shell import WithPro
 GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org', '--resultsLink',
         '/server/collect.cgi']
 TALOS_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:tdhtml:tsvg:twinopen:tsspider:tgfx']
 
 TALOS_NOCHROME_CONFIG_OPTIONS = GRAPH_CONFIG + TALOS_CONFIG_OPTIONS + ['--noChrome']
 
 TALOS_JSS_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'tjss']
 
-TALOS_DIRTY_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:ts_places_generated_min:ts_places_generated_med']
-TALOS_DIRTY_ADDONS = ['/builds/buildbot/profiles/dirtyDBs.zip']
+TALOS_DIRTY_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:ts_places_generated_min:ts_places_generated_med:ts_places_generated_max']
+TALOS_DIRTY_ADDONS = ['/builds/buildbot/profiles/dirtyDBs.zip', '/builds/buildbot/profiles/dirtyMaxDBs.zip']
 
 TALOS_TP4_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'tp4']
 
 TALOS_CMD = ['python', 'run_tests.py', '--noisy', WithProperties('%(configFile)s')]
 
 SLAVES = {
     'linux': ["talos-rev2-linux%02i" % x for x in range(1,21)],
     'xp': ["talos-rev2-xp%02i" % x for x in range(1,25)],
@@ -57,16 +57,17 @@ BRANCHES['mozilla-1.9.0']['branch_name']
 BRANCHES['mozilla-1.9.0']['build_branch'] = "1.9.0"
 BRANCHES['mozilla-1.9.0']['fetch_symbols'] = False
 # How many chrome tests per build to run, and whether to merge build requests
 BRANCHES['mozilla-1.9.0']['chrome_tests'] = (1,True, [])
 # How many nochrome tests per build to run, and whether to merge build requests
 BRANCHES['mozilla-1.9.0']['nochrome_tests'] = (1,True, [])
 BRANCHES['mozilla-1.9.0']['jss_tests'] = (0,True, [])
 BRANCHES['mozilla-1.9.0']['tp4_tests'] = (0,True, [])
+BRANCHES['mozilla-1.9.0']['dirty_tests'] = (0, True, TALOS_DIRTY_ADDONS)
 BRANCHES['mozilla-1.9.0']['ftp_urls'] = {
     'win32': [
         "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/FX-WIN32-TBOX-mozilla1.9.0/",
         "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/",
         ],
     'linux': [
         "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/fx-linux-tbox-mozilla1.9.0/",
         "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.9.0/",
--- a/talos-pool/master.cfg
+++ b/talos-pool/master.cfg
@@ -98,18 +98,17 @@ for platform in PLATFORMS:
 for branch, branch_config in BRANCHES.items():
     branchName = branch_config['branch_name']
     buildBranch = branch_config['build_branch']
     branch_builders = []
     for platform, platform_config in PLATFORMS.items():
         chrome_tests, chrome_merge, chrome_addon = branch_config['chrome_tests']
         nochrome_tests, nochrome_merge , nochrome_addon = branch_config['nochrome_tests']
         jss_tests, jss_merge, jss_addon = branch_config['jss_tests']
-        dirty_tests, dirty_merge, dirty_addon = \
-          branch_config.get('dirty_tests', (0, False, []))
+        dirty_tests, dirty_merge, dirty_addon = branch_config['dirty_tests']
         tp4_tests, tp4_merge, tp4_addon = branch_config['tp4_tests']
 
         for slave_platform in platform_config['slave_platforms']:
             if chrome_tests:
                 factory = TalosFactory(
                     OS=slave_platform,
                     toolsDir="tools",
                     envName=platform_config['env_name'],
--- a/talos-try/config.py
+++ b/talos-try/config.py
@@ -3,18 +3,18 @@ from buildbot.steps.shell import WithPro
 GRAPH_CONFIG = ['--resultsServer', 'graphs-stage.mozilla.org', '--resultsLink', '/server/collect.cgi']
 
 TALOS_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:tdhtml:tsvg:twinopen:tsspider:tgfx']
 
 TALOS_CMD = ['python', 'run_tests.py', '--noisy', WithProperties('%(configFile)s')]
 
 TALOS_JSS_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'tjss']
 
-TALOS_DIRTY_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:ts_places_generated_min:ts_places_generated_med']
-TALOS_DIRTY_ADDONS = ['/builds/buildbot/profiles/dirtyDBs.zip']
+TALOS_DIRTY_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'ts:ts_places_generated_min:ts_places_generated_med:ts_places_generated_max']
+TALOS_DIRTY_ADDONS = ['/builds/buildbot/profiles/dirtyDBs.zip', '/builds/buildbot/profiles/dirtyMaxDBs.zip']
 
 TALOS_TP4_CONFIG_OPTIONS = GRAPH_CONFIG + ['--activeTests', 'tp4']
 
 SLAVES = {
     'linux': ["qm-pubuntu-try%02i" % x for x in range(1,7)],
     'xp': ["qm-pxp-try%02i" % x for x in range(1,7)],
     'vista': ["qm-pvista-try%02i" % x for x in range(1,7)],
     'tiger': ["qm-ptiger-try%02i" % x for x in range(1,7)],