WebRTC: Refactor builder configs to reduce duplication.

masters/master.chromium.webrtc.fyi/master_builders_cfg.py

+# Copyright 2015 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.
+
+from buildbot.changes.filter import ChangeFilter
+from buildbot.scheduler import Periodic
+from buildbot.schedulers.basic import SingleBranchScheduler
+
+from master.factory import annotator_factory
+
+m_annotator = annotator_factory.AnnotatorFactory()
+
+def Update(c):
+  hourly_builders = [
+    'Mac Builder',
+    'Mac GN',
+    'Mac GN (dbg)',
+    'Linux',
+    'Linux GN',
+    'Linux GN (dbg)',
+    'Android Builder (dbg)',
+    'Android Builder ARM64 (dbg)',
+    'Android GN',
+    'Android GN (dbg)',

[nodir, 2015/10/15 22:27:48]

sort?

[kjellander_chromium, 2015/10/16 10:09:08]

Oh, right. This is the order they're displayed in the waterfall, but I realize
now that only matters for the spec listing below, so I've sorted this now.

+  ]
+  win_builders = [
+    'Win Builder',
+    'Win GN',
+    'Win GN (dbg)',
+  ]
+  all_builders = win_builders + hourly_builders
+
+  c['schedulers'].extend([
+      SingleBranchScheduler(name='webrtc_scheduler',
+                            change_filter=ChangeFilter(project='webrtc',
+                                                       branch='master'),
+                            treeStableTimer=0,
+                            builderNames=all_builders),
+      Periodic(name='hourly_periodic_scheduler',
+               periodicBuildTimer=60*60,
+               builderNames=hourly_builders),
+      Periodic(name='4hours_periodic_scheduler',
+               periodicBuildTimer=4*60*60,
+               builderNames=win_builders),
+  ])
+
+  specs = [
+    {'name': 'Win Builder', 'category': 'win'},
+    {'name': 'WinXP Tester', 'category': 'win'},
+    {'name': 'Win7 Tester', 'category': 'win'},
+    {'name': 'Win10 Tester', 'category': 'win'},
+    {
+      'name': 'Win GN',
+      'recipe': 'chromium_gn',
+      'category': 'win',
+      'slavebuilddir': 'win_gn',
+    },
+    {
+      'name': 'Win GN (dbg)',
+      'recipe': 'chromium_gn',
+      'category': 'win',
+      'slavebuilddir': 'win_gn',
+    },
+    {'name': 'Mac Builder', 'category': 'mac'},
+    {'name': 'Mac Tester', 'category': 'mac'},
+    {
+      'name': 'Mac GN',
+      'recipe': 'chromium_gn',
+      'category': 'mac',
+      'slavebuilddir': 'mac_gn',
+    },
+    {
+      'name': 'Mac GN (dbg)',
+      'recipe': 'chromium_gn',
+      'category': 'mac',
+      'slavebuilddir': 'mac_gn',
+    },
+    {'name': 'Linux', 'category': 'linux'},
+    {
+      'name': 'Linux GN',
+      'recipe': 'chromium_gn',
+      'category': 'linux',
+      'slavebuilddir': 'linux_gn',
+    },
+    {
+      'name': 'Linux GN (dbg)',
+      'recipe': 'chromium_gn',
+      'category': 'linux',
+      'slavebuilddir': 'linux_gn',
+    },
+    {'name': 'Android Builder (dbg)', 'category': 'android'},
+    {
+      'name': 'Android Builder ARM64 (dbg)',
+      'category': 'android',
+      'slavebuilddir': 'android_arm64',
+    },
+    {'name': 'Android Tests (dbg) (J Nexus4)', 'category': 'android'},
+    {'name': 'Android Tests (dbg) (K Nexus5)', 'category': 'android'},
+    {'name': 'Android Tests (dbg) (L Nexus5)', 'category': 'android'},
+    {'name': 'Android Tests (dbg) (L Nexus6)', 'category': 'android'},
+    {'name': 'Android Tests (dbg) (L Nexus7.2)', 'category': 'android'},
+    {'name': 'Android Tests (dbg) (L Nexus9)', 'category': 'android'},
+    {
+      'name': 'Android GN',
+      'recipe': 'chromium_gn',
+      'category': 'android',
+      'slavebuilddir': 'android_gn',
+    },
+    {
+      'name': 'Android GN (dbg)',
+      'recipe': 'chromium_gn',
+      'category': 'android',
+      'slavebuilddir': 'android_gn',
+    },
+  ]
+
+  for spec in specs:
+    builder_dict = {
+      'name': spec['name'],
+      'factory': m_annotator.BaseFactory(spec.get('recipe', 'webrtc/chromium')),
+      'category': spec['category'],
+      'notify_on_missing': True,
+    }
+    if 'slavebuilddir' in spec:

[kjellander_chromium, 2015/10/15 12:08:40]

From reading the code it looks like the behavior is different when
'slavebuilddir' is missing and when it exists but has a value of None. Because
of that I didn't want to risk changing behavior, which led to this solution.

Previously all builders had it set, but I know from previous experience that if
it's not set, the builder will get a slave build dir named similarly to the
builder name, which is fine with ours, since there aren't that many different
builders sharing the same machines.

+      builder_dict['slavebuilddir'] = spec['slavebuilddir']
+
+    c['builders'].append(builder_dict)