Address PR comments, randomly assign owners for new tests.

hack/update_owners.py

@@ -14,21 +14,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import collections
 import csv
 import re
 import json
 import os
+import random
 import sys
 import time
 import urllib2
 import zlib
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-OWNERS_PATH = os.path.abspath(os.path.join(BASE_DIR, '..', 'test', 'test_owners.csv'))
-
+OWNERS_PATH = os.path.abspath(
+    os.path.join(BASE_DIR, '..', 'test', 'test_owners.csv'))
+GCS_URL_BASE = 'https://storage.googleapis.com/kubernetes-test-history/'
+SKIP_MAINTAINERS = {
+    'aronchick', 'bgrant0607-nocc', 'goltermann', 'sarahnovotny'}
 
 def get_test_history():
-    url = time.strftime('https://storage.googleapis.com/kubernetes-test-history/logs/%Y-%m-%d.json')
+    url = time.strftime(GCS_URL_BASE + 'logs/%Y-%m-%d.json')
     resp = urllib2.urlopen(url)
     content = resp.read()
     if resp.headers.get('content-encoding') == 'gzip':
@@ -44,42 +49,47 @@ def normalize(name):
 
 def load_owners(fname):
     owners = {}
-    for n, (name, owner, random_assignment) in enumerate(csv.reader(open(fname))):
-        if n == 0:
-            continue  # header
-        owners[normalize(name)] = (owner, int(random_assignment))
-    return owners
+    with open(fname) as f:
+        for n, (name, owner, random_assignment) in enumerate(csv.reader(f)):
+            if n == 0:
+                continue  # header
+            owners[normalize(name)] = (owner, int(random_assignment))
+        return owners
 
 
 def write_owners(fname, owners):
-    out = csv.writer(open(fname, 'w'))
-    out.writerow(['name', 'owner', 'auto-assigned'])
-    for name, (owner, random_assignment) in sorted(owners.items()):
-        out.writerow([name, owner, int(random_assignment)])
+    with open(fname, 'w') as f:
+        out = csv.writer(f, lineterminator='\n')
+        out.writerow(['name', 'owner', 'auto-assigned'])
+        for name, (owner, random_assignment) in sorted(owners.items()):
+            out.writerow([name, owner, int(random_assignment)])
 
 
 def get_maintainers():
-    # Github doesn't seem to support team membership listing without org admin privileges.
-    # Instead, we do it manually:
+    # Github doesn't seem to support team membership listing without a key with
+    # org admin privileges. Instead, we do it manually:
     # Open https://github.com/orgs/kubernetes/teams/kubernetes-maintainers
     # Run this in the js console:
-    # [].slice.call(document.querySelectorAll('.team-member-username a')).map(e => e.textContent.trim())
-    return ["a-robinson", "alex-mohr", "amygdala", "andyzheng0831", "apelisse", "aronchick", 
-        "ArtfulCoder", "bgrant0607", "bgrant0607-nocc", "bprashanth", "brendandburns", 
-        "caesarxuchao", "childsb", "cjcullen", "david-mcmahon", "davidopp", "dchen1107", 
-        "deads2k", "derekwaynecarr", "dubstack", "eparis", "erictune", "fabioy", 
-        "fejta", "fgrzadkowski", "freehan", "ghodss", "girishkalele", "gmarek", 
-        "goltermann", "grodrigues3", "hurf", "ingvagabund", "ixdy", 
-        "jackgr", "janetkuo", "jbeda", "jdef", "jingxu97", "jlowdermilk", 
-        "jsafrane", "jszczepkowski", "justinsb", "kargakis", "karlkfi", 
-        "kelseyhightower", "kevin-wangzefeng", "krousey", "lavalamp", 
-        "liggitt", "luxas", "madhusudancs", "maisem", "mansoorj", 
-        "matchstick", "mikedanese", "mml", "mtaufen", "mwielgus", "ncdc", 
-        "nikhiljindal", "piosz", "pmorie", "pwittrock", "Q-Lee", "quinton-hoole", 
-        "Random-Liu", "rmmh", "roberthbailey", "ronnielai", "saad-ali", "sarahnovotny", 
-        "smarterclayton", "soltysh", "spxtr", "sttts", "swagiaal", "thockin", 
-        "timothysc", "timstclair", "tmrts", "vishh", "vulpecula", "wojtek-t", "xiang90", 
-        "yifan-gu", "yujuhong", "zmerlynn"]
+    # [].slice.call(document.querySelectorAll('.team-member-username a')).map(
+    #     e => e.textContent.trim())
+    ret = {"a-robinson", "alex-mohr", "amygdala", "andyzheng0831", "apelisse",
+        "aronchick", "ArtfulCoder", "bgrant0607", "bgrant0607-nocc",
+        "bprashanth", "brendandburns", "caesarxuchao", "childsb", "cjcullen",
+        "david-mcmahon", "davidopp", "dchen1107", "deads2k", "derekwaynecarr",
+        "dubstack", "eparis", "erictune", "fabioy", "fejta", "fgrzadkowski",
+        "freehan", "ghodss", "girishkalele", "gmarek", "goltermann",
+        "grodrigues3", "hurf", "ingvagabund", "ixdy",
+        "jackgr", "janetkuo", "jbeda", "jdef", "jingxu97", "jlowdermilk",
+        "jsafrane", "jszczepkowski", "justinsb", "kargakis", "karlkfi",
+        "kelseyhightower", "kevin-wangzefeng", "krousey", "lavalamp",
+        "liggitt", "luxas", "madhusudancs", "maisem", "mansoorj", "matchstick",
+        "mikedanese", "mml", "mtaufen", "mwielgus", "ncdc", "nikhiljindal",
+        "piosz", "pmorie", "pwittrock", "Q-Lee", "quinton-hoole", "Random-Liu",
+        "rmmh", "roberthbailey", "ronnielai", "saad-ali", "sarahnovotny",
+        "smarterclayton", "soltysh", "spxtr", "sttts", "swagiaal", "thockin",
+        "timothysc", "timstclair", "tmrts", "vishh", "vulpecula", "wojtek-t",
+        "xiang90", "yifan-gu", "yujuhong", "zmerlynn"}
+    return sorted(ret - SKIP_MAINTAINERS)
 
 
 def main():
@@ -99,10 +109,25 @@ def main():
     for name in outdated_tests:
         owners.pop(name)
 
-    print '# UNEXPECTED MAINTAINERS (randomly assigned, not in kubernetes-maintainers)'
+    print '# UNEXPECTED MAINTAINERS ',
+    print '(randomly assigned, but not in kubernetes-maintainers)'
     for name, (owner, random_assignment) in sorted(owners.iteritems()):
         if random_assignment and owner not in maintainers:
             print '%-16s %s' % (owner, name)
+            owners.pop(name)
+    print
+
+    owner_counts = collections.Counter(
+        owner for name, (owner, random) in owners.iteritems()
+        if owner in maintainers)
+    for test_name in set(test_names) - set(owners):
+        new_owner, _count = random.choice(owner_counts.most_common()[-4:])
+        owner_counts[new_owner] += 1
+        owners[test_name] = (new_owner, True)
+
+    print '# Tests per maintainer:'
+    for owner, count in owner_counts.most_common():
+        print '%-20s %3d' % (owner, count)
 
     write_owners(OWNERS_PATH + '.new', owners)