bug 414660: bustage fix for talos dirty profile testing (fix syntax errors). r=bustage
authorBen Hearsum <bhearsum@mozilla.com>
Thu, 20 Aug 2009 09:01:55 -0400
changeset 1446 2cc63cf7e6849dea9909efdb6cac9b7b76d3f399
parent 1445 b0b059bdaabaa7a54b9ed871ae7f47e5cd584a29
child 1447 e309a03d252ee8be2fec36ea7d1ecd4dc7553283
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersbustage
bugs414660
bug 414660: bustage fix for talos dirty profile testing (fix syntax errors). r=bustage
talos-pool/master.cfg
talos-staging-pool/master.cfg
talos-try/master.cfg
--- a/talos-pool/master.cfg
+++ b/talos-pool/master.cfg
@@ -98,17 +98,18 @@ 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['dirty_tests']
+        dirty_tests, dirty_merge, dirty_addon = \
+          branch_config.get('dirty_tests', (0, False, []))
         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-staging-pool/master.cfg
+++ b/talos-staging-pool/master.cfg
@@ -111,17 +111,18 @@ for platform in PLATFORMS:
 
 for branch, branch_config in BRANCHES.items():
     branchName = branch_config['branch_name']
     buildBranch = branch_config['build_branch']
     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['dirty_tests']
+        dirty_tests, dirty_merge, dirty_addon = \
+          branch_config.get('dirty_tests', (0, False, []))
         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/master.cfg
+++ b/talos-try/master.cfg
@@ -166,22 +166,22 @@ for platform, platform_config in PLATFOR
             OS=slave_platform,
             toolsDir="tools",
             envName=platform_config['env_name'],
             workdirBase="../talos-data",
             buildBranch="Try",
             branchName="MozillaTest",
             configOptions=TALOS_DIRTY_CONFIG_OPTIONS,
             talosCmd=TALOS_CMD,
-            fetchSymbols=false,
+            fetchSymbols=False,
             talosAddOns=TALOS_DIRTY_ADDONS,
         )
         platform_name = platform_config[slave_platform]['name']
         builder = {
-            'name': "%s try talos dirty" % (branch),
+            'name': "%s try talos dirty" % (platform_name),
             'slavenames': SLAVES[slave_platform],
             'builddir': "%s-dirty" % (slave_platform),
             'factory': dirty_factory,
         }
         s = NoMergeMultiScheduler(name='%s dirty scheduler' % (slave_platform),
                       branch='%s' % (platform),
                       treeStableTimer=0,
                       builderNames=[builder['name']],