Add an `mb audit` command to track the GYP->GN progress.

tools/mb/mb.py

 #!/usr/bin/env python
 # 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.
 
 """MB - the Meta-Build wrapper around GYP and GN
 
 MB is a wrapper script for GYP and GN that can be used to generate build files
 for sets of canned configurations and analyze them.
 """
 
 from __future__ import print_function
 
 import argparse
 import ast
 import errno
 import json
 import os
 import pipes
 import pprint
 import re
 import shutil
 import sys
 import subprocess
 import tempfile
+import urllib2
+
+from collections import OrderedDict
 
 def main(args):
   mbw = MetaBuildWrapper()
   mbw.ParseArgs(args)
 
   try:
     ret = mbw.args.func()
     if ret:
       mbw.DumpInputFiles()
     return ret
@@ skipping 99 matching lines @@
     subp.set_defaults(func=self.CmdRun)
 
     subp = subps.add_parser('validate',
                             help='validate the config file')
     subp.add_argument('-f', '--config-file', metavar='PATH',
                       default=self.default_config,
                       help='path to config file '
                           '(default is //tools/mb/mb_config.pyl)')
     subp.set_defaults(func=self.CmdValidate)
 
+    subp = subps.add_parser('audit',
+                            help='Audit the config file to track progress')
+    subp.add_argument('-f', '--config-file', metavar='PATH',
+                      default=self.default_config,
+                      help='path to config file '
+                          '(default is //tools/mb/mb_config.pyl)')
+    subp.add_argument('-i', '--internal', action='store_true',
+                      help='check internal masters also')
+    subp.add_argument('-m', '--master', action='append',
+                      help='master to audit (default is all non-internal '
+                           'masters in file)')
+    subp.add_argument('-u', '--url-template', action='store',
+                      default='https://build.chromium.org/p/'
+                              '{master}/json/builders',
+                      help='URL scheme for JSON APIs to buildbot '
+                           '(default: %(default)s) ')
+    subp.set_defaults(func=self.CmdAudit)
+
     subp = subps.add_parser('help',
                             help='Get help on a subcommand.')
     subp.add_argument(nargs='?', action='store', dest='subcommand',
                       help='The command to get help for.')
     subp.set_defaults(func=self.CmdHelp)
 
     self.args = parser.parse_args(argv)
 
   def DumpInputFiles(self):
 
@@ skipping 172 matching lines @@
         for mixin in self.configs[config]:
           RecurseMixins(mixin)
 
     if errs:
       raise MBErr(('mb config file %s has problems:' % self.args.config_file) +
                     '\n  ' + '\n  '.join(errs))
 
     self.Print('mb config file %s looks ok.' % self.args.config_file)
     return 0
 
+  def CmdAudit(self):
+    self.ReadConfigFile()
+
+    STAT_MISSING_ON_MASTER = 'in config but not on master'
+    STAT_MISSING_IN_CONFIG = 'on master but not in config'
+    STAT_TBD = 'still TBD'
+    STAT_GYP = 'still on GYP'
+    STAT_DONE = 'done (on GN)'
+    stats = OrderedDict()
+    stats[STAT_MISSING_ON_MASTER] = 0
+    stats[STAT_MISSING_IN_CONFIG] = 0
+    stats[STAT_TBD] = 0
+    stats[STAT_GYP] = 0
+    stats[STAT_DONE] = 0
+
+    masters = self.args.master or self.masters
+    for master in sorted(masters):
+      config_builders = sorted(self.masters[master])
+      url = self.args.url_template.replace('{master}', master)
+
+      self.Print('Auditing %s' % master)
+
+      MASTERS_TO_SKIP = (
+        'client.skia',
+        'client.v8.fyi',
+        'tryserver.v8',
+      )
+      if master in MASTERS_TO_SKIP:
+        # We skip these bots because we don't care if they're converted.
+        self.Print('  skipped (do not care if incomplete)')
+        self.Print('')
+        continue
+
+      INTERNAL_MASTERS = (
+        'chrome',
+        'chrome.continuous',
+        'official.desktop',
+        'official.desktop.continuous'
+      )
+      if master in INTERNAL_MASTERS and not self.args.internal:
+        self.Print('  skipped (internal)')
+        self.Print('')
+        continue
+
+      try:
+        json_contents = self.Fetch(url)
+        d = json.loads(json_contents)
+      except Exception as e:
+        self.Print(str(e))
+        return 1
+
+      missing_on_master = []
+      missing_in_config = []
+      tbd = []
+      gyp = []
+      done = []
+      buildbot_builders = sorted(d.keys())
+      for builder in config_builders:
+        if builder in buildbot_builders:
+           config = self.masters[master][builder]
+           if config == 'tbd':
+             tbd.append(builder)
+           else:
+             # TODO(dpranke): Check if MB is actually running?
+             vals = self.FlattenConfig(config)
+             if vals['type'] == 'gyp':
+               gyp.append(builder)
+             else:
+               done.append(builder)
+        else:
+           missing_on_master.append(builder)
+
+      for builder in buildbot_builders:

[estaab, 2016/03/12 04:07:27]

nit:
missing_in_config = sorted(set(buildbot_builders) - set(config_builders))

you could probably just operate on sets starting at 409 and just sort at the
end.

+        if builder not in config_builders:
+          missing_in_config.append(builder)
+
+      def PrintBuilders(heading, builders):
+        stats.setdefault(heading, 0)
+        stats[heading] += len(builders)
+        if builders:
+          self.Print('  %s:' % heading)
+          for builder in builders:
+            self.Print('    %s' % builder)
+
+      if missing_in_config or missing_on_master or tbd or gyp:
+        PrintBuilders(STAT_MISSING_IN_CONFIG, missing_in_config)
+        PrintBuilders(STAT_MISSING_ON_MASTER, missing_on_master)
+        PrintBuilders(STAT_TBD, tbd)
+        PrintBuilders(STAT_GYP, gyp)
+      else:
+        self.Print('  ... ok')
+
+      stats[STAT_DONE] += len(done)
+
+      self.Print('')
+
+    fmt = '{:<27} {:>4}'
+    self.Print(fmt.format('Totals', str(sum(int(v) for v in stats.values()))))
+    self.Print(fmt.format('-' * 27, '----'))
+    for stat, count in stats.items():
+      self.Print(fmt.format(stat, str(count)))
+    return 0
+
   def GetConfig(self):
     build_dir = self.args.path[0]
 
     vals = {}
     if self.args.builder or self.args.master or self.args.config:
       vals = self.Lookup()
       if vals['type'] == 'gn':
         # Re-run gn gen in order to ensure the config is consistent with the
         # build dir.
         self.RunGNGen(vals)
@@ skipping 742 matching lines @@
     return p.returncode, out, err
 
   def ExpandUser(self, path):
     # This function largely exists so it can be overridden for testing.
     return os.path.expanduser(path)
 
   def Exists(self, path):
     # This function largely exists so it can be overridden for testing.
     return os.path.exists(path)
 
+  def Fetch(self, url):
+
+    f = urllib2.urlopen(url)
+    contents = f.read()
+    f.close()
+    return contents
+
   def GNTargetName(self, target):
     return target[:-len('_apk')] if target.endswith('_apk') else target
 
   def MaybeMakeDirectory(self, path):
     try:
       os.makedirs(path)
     except OSError, e:
       if e.errno != errno.EEXIST:
         raise
 
@@ skipping 68 matching lines @@
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except MBErr as e:
     print(e)
     sys.exit(1)
   except KeyboardInterrupt:
     print("interrupted, exiting", stream=sys.stderr)
     sys.exit(130)