bug 557260 - address a deficiency in my local testing r=aki
authorJohn Ford <jhford@mozilla.com>
Fri, 27 May 2011 17:47:23 -0400
changeset 1564 892fa7ef7183742c11b3fd2d3bb2fec39922bc54
parent 1563 cd07adce87fd0df207c835340ac7af2137241136
child 1565 99776bac30a20137bca8c8ceca73c4b97e99c234
push id1086
push userjford@mozilla.com
push dateFri, 27 May 2011 21:47:38 +0000
reviewersaki
bugs557260
bug 557260 - address a deficiency in my local testing r=aki
misc.py
--- a/misc.py
+++ b/misc.py
@@ -613,19 +613,29 @@ def generateBranchObjects(config, name):
     unittestPrettyNames = {}
     unittestSuites = []
     # These dicts provides mapping between en-US dep and nightly scheduler names
     # to l10n dep and l10n nightly scheduler names. It's filled out just below here.
     l10nBuilders = {}
     l10nNightlyBuilders = {}
     pollInterval = config.get('pollInterval', 60)
     l10nPollInterval = config.get('l10nPollInterval', 5*60)
+
+    # This section is to make it easier to disable certain products.
+    # Ideally we could specify a shorter platforms key on the branch,
+    # but that doesn't work
+    enabled_platforms = []
+    for platform in sorted(config['platforms'].keys()):
+        pf = config['platforms'][platform]
+        if pf['stage_product'] in config['enabled_products']:
+            enabled_platforms.append(platform)
+
     # generate a list of builders, nightly builders (names must be different)
     # for easy access
-    for platform in config['platforms'].keys():
+    for platform in enabled_platforms:
         pf = config['platforms'][platform]
         base_name = pf['base_name']
         pretty_name = PRETTY_NAME % base_name
         if platform.endswith("-debug"):
             debugBuilders.append(pretty_name)
             prettyNames[platform] = pretty_name
             # Debug unittests
             if pf.get('enable_unittests'):
@@ -963,19 +973,18 @@ def generateBranchObjects(config, name):
             name='weekly-%s' % name,
             branch=config['repo_path'],
             dayOfWeek=5, # Saturday
             hour=[3], minute=[02],
             builderNames=coverageBuilders + weeklyBuilders,
             )
     branchObjects['schedulers'].append(weekly_scheduler)
 
-    # This section is to make it easier to disable certain products.
-    # Ideally we could specify a shorter platforms key on the branch,
-    # but that doesn't work
+    # We iterate throught the platforms a second time, so we need
+    # to ensure that disabled platforms aren't configured the second time
     enabled_platforms = []
     for platform in sorted(config['platforms'].keys()):
         pf = config['platforms'][platform]
         if pf['stage_product'] in config['enabled_products']:
             enabled_platforms.append(platform)
 
     for platform in enabled_platforms:
         # shorthand