Rename Mac/Win GN builders to GYP builders.

tests/masters_recipes_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 import argparse
 import json
 import os
 import subprocess
 import sys
@@ skipping 49 matching lines @@
         'ios-simulator-gn',
         'Mac10.11 Tests',
     ],
     'master.chromium.memory': [
         'Linux ASan Tests (sandboxed)',
     ],
     'master.chromium.win': [
         'Win7 (32) Tests',
         'Win x64 Builder (dbg)',
     ],
+
+}
+
+
+# This dict should normally be empty, but may be non-empty when builders
+# are being renamed, so that recipes can continue to refer to builders
+# that are in the process of being removed.
+DEPRECATED_BUILDERS = {
+    # TODO(dpranke): Remove these after the masters have restarted.
+    'master.chromium.mac': [
+        'Mac GN',
+        'Mac GN (dbg)',
+    ],
+    'master.chromium.win': [
+        'Win8 Aura',
+        'Win8 GN (dbg)',
+    ],
+    'master.tryserver.chromium.mac': [
+        'mac_chromium_gn_dbg',
+        'mac_chromium_gn_rel',
+    ],
+    'master.tryserver.chromium.win': [
+        'win8_chromium_gn_dbg',
+        'win8_chromium_ng',
+    ],
 }
 
 
 def getBuilders(recipe_name, deps_path):
   """Asks the given recipe to dump its BUILDERS dictionary.
 
   This must be implemented by the recipe in question.
 
   deps_path is where the recipe engine should download the dependent recipe
   packages. This is to avoid git.lock collision.
@@ skipping 55 matching lines @@
   chromium_trybot_BUILDERS = getBuilders(
       'chromium_trybot', os.path.join(
           current_dir, '.chromium_trybot_recipe_deps'))
   chromium_BUILDERS = getBuilders(
       'chromium', os.path.join(
           current_dir, '.chromium_recipe_deps'))
 
   cq_builders = getCQBuilders(args.cq_config) if args.cq_config else None
 
   for master in MAIN_WATERFALL_MASTERS:
+
     builders = getBuildersAndRecipes(master)
     all_builders.update((master, b) for b in builders)
+    deprecated_builders = set(DEPRECATED_BUILDERS.get(master, []))
 
     # We only have a standardized way to mirror builders using the chromium
     # recipe on the tryserver.
     chromium_recipe_builders[master] = [b for b in builders
                                         if builders[b] == 'chromium']
 
     recipe_side_builders = chromium_BUILDERS.get(
         master.replace('master.', ''), {}).get('builders')
     if recipe_side_builders is not None:
       bogus_builders = set(recipe_side_builders.keys()).difference(
-          set(builders.keys()))
+          set(builders.keys())).difference(deprecated_builders)
       if bogus_builders:
+        import pdb; pdb.set_trace()

[martiniss, 2016/06/25 04:39:49]

Left in some debug code.

[Dirk Pranke, 2016/06/25 04:45:37]

Ah, so I did. Good thing it doesn't fire :).

I'll fix it when I revert these changes after the builders are fixed.

         exit_code = 1
         print 'The following builders from chromium recipe'
         print 'do not exist in master config for %s:' % master
         print '\n'.join('\t%s' % b for b in sorted(bogus_builders))
 
       other_recipe_builders = set(recipe_side_builders.keys()).difference(
-          set(chromium_recipe_builders[master]))
+          set(chromium_recipe_builders[master])).difference(
+              deprecated_builders)
       if other_recipe_builders:
         exit_code = 1
         print 'The following builders from chromium recipe'
         print 'are configured to run a different recipe on the master'
         print '(%s):' % master
         print '\n'.join('\t%s' % b for b in sorted(other_recipe_builders))
 
 
   for master in TRYSERVER_MASTERS:
     short_master = master.replace('master.', '')
     builders = getBuildersAndRecipes(master)
     recipe_side_builders = chromium_trybot_BUILDERS[
         short_master]['builders']
+    deprecated_builders = set(DEPRECATED_BUILDERS.get(master, []))
 
     bogus_builders = set(recipe_side_builders.keys()).difference(
-        set(builders.keys()))
+        set(builders.keys())).difference(deprecated_builders)
     if bogus_builders:
       exit_code = 1
       print 'The following builders from chromium_trybot recipe'
       print 'do not exist in master config for %s:' % master
       print '\n'.join('\t%s' % b for b in sorted(bogus_builders))
 
     for builder, recipe in builders.iteritems():
       # Only the chromium_trybot recipe knows how to mirror a main waterfall
       # builder.
       if recipe != 'chromium_trybot':
@@ skipping 39 matching lines @@
     exit_code = 1
     print 'Unused suppressions:'
     print '\n'.join(sorted(
         '\t%s:%s' % (b[0], b[1]) for b in unused_suppressions))
 
   return exit_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))