Split the mac 10.5 perf bot in two. This way we will be more likely to have ...

master.chromium/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This is the buildmaster config file for the 'chromium' bot. It must
 # be installed as 'master.cfg' in your buildmaster's base directory
 # (although the filename can be changed with the --basedir option to
@@ skipping 167 matching lines @@
 
 # Scheduler to trigger slaves that depend on the mac release build.
 s_chromium_rel_mac_builder = Scheduler(name='chromium_rel_mac_builder',
                                        branch='src',
                                        treeStableTimer=60,
                                        builderNames=['Chromium Mac Builder'])
 
 s_chromium_rel_mac_dependent = Dependent('chromium_rel_mac_dependent',
                                          s_chromium_rel_mac_builder,
                                          ['Mac10.5 Tests',
-                                          'Mac10.5 Perf',
+                                          'Mac10.5 Perf(1)',
+                                          'Mac10.5 Perf(2)',
                                           # add Mac10.6 Tests & Perf
                                          ])
 
 
 # Scheduler to trigger slaves that depend on the debug build.
 s_chromium_dbg_builder = Scheduler(name='chromium_dbg_builder',
                                    branch='src',
                                    treeStableTimer=60,
                                    builderNames=['Chromium Builder (dbg)'])
 
@@ skipping 503 matching lines @@
                              factory_properties={'ui_total_shards': 2,
                                                  'ui_shard_index': 1})
 
 f_cr_dbg_mac_tests_2 = F_MAC('chromium-dbg-mac', slave_type='Tester',
                              target='Debug',
                              build_url=chromium_dbg_mac_archive,
                              tests=['unit', 'ui'],
                              factory_properties={'ui_total_shards': 2,
                                                  'ui_shard_index': 2})
 
-# TODO: XP/Vista Perf also runs: 'memory', 'reliability', 'dom_checker'
-f_cr_rel_mac5_perf = F_MAC('chromium-rel-mac5', slave_type='Tester',
-                           build_url=chromium_rel_mac_archive,
-                           tests=['page_cycler', 'startup', 'dom_perf',
-                                  'page_cycler_http', 'tab_switching',
-                                  'sunspider', 'v8_benchmark',
-                                  'memory'],
-                           factory_properties={'show_perf_results': True,
-                                               'perf_id': 'chromium-rel-mac5'})
+# TODO: XP/Vista Perf also runs: 'reliability', 'dom_checker'
+# We shard these so they finish in 1/2 the time, this way we tend to
+# do more single cls in a run to make regressions show already isolated.
+f_cr_rel_mac5_perf_1 = F_MAC('chromium-rel-mac5', slave_type='Tester',
+                             build_url=chromium_rel_mac_archive,
+                             tests=['page_cycler', 'v8_benchmark'],
+                             factory_properties={'show_perf_results': True,
+                                                 'perf_id': 'chromium-rel-mac5'})
+
+f_cr_rel_mac5_perf_2 = F_MAC('chromium-rel-mac5', slave_type='Tester',
+                             build_url=chromium_rel_mac_archive,
+                             tests=['startup', 'dom_perf',
+                                    'page_cycler_http', 'tab_switching',
+                                    'sunspider', 'memory'],
+                             factory_properties={'show_perf_results': True,
+                                                 'perf_id': 'chromium-rel-mac5'})
 
 f_cr_dbg_linux_views = F_LINUX('chromium-dbg-linux-views',
     target='Debug', tests=[], options=['chrome'],
     factory_properties={'gclient_env': { 'GYP_DEFINES':'toolkit_views=1'}})
 
 f_cr_rel_linux_chromeos = F_LINUX('chromium-rel-linux-chromeos',
     tests=[], options=['chrome linux_packages'],
     factory_properties={
         'archive_build': True,
         'gclient_env': { 'GYP_DEFINES':'chromeos=1 branding=Chrome'}})
@@ skipping 494 matching lines @@
   'category': '3mac|builder_testers',
 }
 
 b_chromium_dbg_mac5_tests_2 = {'name': 'Mac10.5 Tests (dbg)(2)',
   'slavename': 'codf73',
   'builddir': 'chromium-dbg-mac5-tests-2',
   'factory': f_cr_dbg_mac_tests_2,
   'category': '3mac|builder_testers',
 }
 
-b_chromium_rel_mac5_perf = {'name': 'Mac10.5 Perf',
+b_chromium_rel_mac5_perf_1 = {'name': 'Mac10.5 Perf(1)',
   'slavename': 'codf75',
   'builddir': 'chromium-rel-mac5-perf',
-  'factory': f_cr_rel_mac5_perf,
+  'factory': f_cr_rel_mac5_perf_1,
+  'category': '3mac|builder_testers',
+}
+
+b_chromium_rel_mac5_perf_2 = {'name': 'Mac10.5 Perf(2)',
+  'slavename': 'codf80',
+  'builddir': 'chromium-rel-mac5-perf',

[Nicolas Sylvain, 2009/09/09 14:27:47]

i dont think you can share builddir.

+  'factory': f_cr_rel_mac5_perf_2,
   'category': '3mac|builder_testers',
 }
 
 b_sub_rel_mac = {'name': 'Modules Mac',
   'slavename': 'codf67',
   'builddir': 'sub-rel-mac',
   'factory': f_sub_rel_mac,
   'category': '3mac|builders_compile|builder_testers',
 }
 
@@ skipping 106 matching lines @@
   b_chromium_xp_purify_unit,
   b_chromium_rel_vista_tests,
   b_chromium_dbg_vista_tests_1,
   b_chromium_dbg_vista_tests_2,
   b_chromium_rel_linux_valgrind_ui,
   b_chromium_rel_linux_valgrind_ui_2,
   b_chromium_rel_linux_valgrind_ui_3,
   b_chromium_dbg_linux_interactive_tests,
   b_chromium_dbg_xp_interactive_tests,
   b_chromium_rel_xp_perf_dual,
-  b_chromium_rel_mac5_perf,
+  b_chromium_rel_mac5_perf_1,
+  b_chromium_rel_mac5_perf_2,
   b_chromium_rel_linux_hardy,
   b_chromium_rel_xp_perf_single,
   b_chromium_dbg_xp_perf,
   b_chromium_rel_vista_perf_dual,
   b_chromium_rel_vista_perf_single,
   b_chromium_dbg_vista_perf,
   b_webkit_rel_builder,
   b_webkit_dbg_builder,
   b_webkit_rel,
   b_webkit_dbg_1,
@@ skipping 129 matching lines @@
 c['projectURL'] = config.Master.project_url
 
 # the 'buildbotURL' string should point to the location where the buildbot's
 # internal web server (usually the html.Waterfall page) is visible. This
 # typically uses the port number set in the Waterfall 'status' entry, but
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
 c['buildbotURL'] = 'http://build.chromium.org/buildbot/waterfall/'