commit c95e54b558d9a910181715df291402c44e0d8d55
author Ravi Mistry <rmistry@google.com> Thu Nov 14 15:46:47 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 14 21:11:58 2019 +0000
tree b207f590c1e61305b1768fa2336a9c8f01579d51
parent a7e4fe460c58f56aa18bb6c03c2a2c2ebd533611

Specify only luci buckets instead of hardcoding trybot names

I verified that this works

NoTry: true
Bug: skia:9639
Change-Id: Iacc0a865330c2049c8c124365122aa16c4493746
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/254676
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

infra/bots/update_meta_config.py

diff --git a/infra/bots/update_meta_config.py b/infra/bots/update_meta_config.py
index 8688e78..c470e12 100644
--- a/infra/bots/update_meta_config.py
+++ b/infra/bots/update_meta_config.py
@@ -17,53 +17,14 @@
 
 SKIA_REPO_TEMPLATE = 'https://skia.googlesource.com/%s.git'
 
-CQ_INCLUDE_CHROMIUM_TRYBOTS = [
-    ('luci.chromium.try', [
-        'android_optional_gpu_tests_rel',
-        'linux-blink-rel',
-        'linux_chromium_compile_dbg_ng',
-        'linux_chromium_dbg_ng',
-        'linux_chromium_rel_ng',
-        'linux_optional_gpu_tests_rel',
-        'mac10.10-blink-rel',
-        'mac10.11-blink-rel',
-        'mac10.12-blink-rel',
-        'mac10.13-blink-rel',
-        'mac10.13_retina-blink-rel',
-        'mac_chromium_compile_dbg_ng',
-        'mac_chromium_compile_rel_ng',
-        'mac_chromium_dbg_ng',
-        'mac_chromium_rel_ng',
-        'mac_optional_gpu_tests_rel',
-        'win10-blink-rel',
-        'win7-blink-rel',
-        'win_chromium_compile_dbg_ng',
-        'win_chromium_dbg_ng',
-        'win_optional_gpu_tests_rel',
-    ]),
-    ('master.tryserver.chromium.linux', [
-        'linux_chromium_compile_rel_ng',
-    ]),
-    ('master.tryserver.chromium.win', [
-        'win_chromium_compile_rel_ng',
-        'win7_chromium_rel_ng',
-        'win10_chromium_x64_rel_ng',
-    ]),
-    ('master.tryserver.chromium.android', [
-        'android_blink_rel',
-        'android_compile_dbg',
-        'android_compile_rel',
-        'android_n5x_swarming_dbg',
-        'android_n5x_swarming_rel',
-    ])
+CQ_INCLUDE_CHROMIUM_BUCKETS = [
+    'luci.chromium.try',
 ]
 
 
-def addChromiumTrybots(f):
-  for master, bots in CQ_INCLUDE_CHROMIUM_TRYBOTS:
-    f.write('[bucket "%s"]\n' % master)
-    for bot in bots:
-      f.write('\tbuilder = %s\n' % bot)
+def addChromiumBuckets(f):
+  for bucket in CQ_INCLUDE_CHROMIUM_BUCKETS:
+    f.write('[bucket "%s"]\n' % bucket)
 
 
 def main():
@@ -92,7 +53,7 @@
     with open(buildbucket_config, 'w') as f:
 
       if args.repo_name == 'skia':
-        addChromiumTrybots(f)
+        addChromiumBuckets(f)
 
       # Adding all Skia jobs.
       f.write('[bucket "skia.primary"]\n')