Add luci & test configs for linux-blink-heap-unified-gc.

This also rewrites some of the args logic in generate_buildbot_json.py
and allows for callers to supply additional keys containing args they'd
like to pull in (e.g. "gtest_args" for args that should apply only to
gtests).

Bug: 878321
Change-Id: I2314c90d5959f3cfdaa3898a2de1af2331d07002
Reviewed-on: https://chromium-review.googlesource.com/1197407Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588219}

infra/config/global/cr-buildbucket.cfg

@@ -1033,6 +1033,12 @@ buckets {
       mixins: "linux"
     }
 
+    builders {
+      name: "linux-blink-heap-unified-gc"
+      mixins: "fyi-ci"
+      mixins: "linux"
+    }
+
     builders {
       name: "linux_chromium_component_updater"
       mixins: "linux-ci"

infra/config/global/luci-milo.cfg

@@ -2402,11 +2402,21 @@ consoles {
     name: "buildbucket/luci.chromium.ci/Jumbo Win x64"
     category: "jumbo"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-animation-use-time-delta"
+    category: "linux|blink"
+    short_name: "TD"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-blink-heap-incremental-marking"
     category: "linux|blink"
     short_name: "IM"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-unified-gc"
+    category: "linux|blink"
+    short_name: "UGC"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-blink-heap-verification"
     category: "linux|blink"
@@ -2778,6 +2788,11 @@ consoles {
     category: "linux|blink"
     short_name: "IM"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-unified-gc"
+    category: "linux|blink"
+    short_name: "UGC"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-blink-heap-verification"
     category: "linux|blink"

infra/config/global/luci-scheduler.cfg

@@ -1355,6 +1355,17 @@ job {
   }
 }
 
+job {
+  id: "linux-blink-heap-unified-gc"
+  # Triggered by "Linux Builder (dbg)"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-blink-heap-unified-gc"
+  }
+}
+
 job {
   id: "linux-blink-heap-verification"
   acl_sets: "default"

testing/buildbot/generate_buildbot_json.py

@@ -351,24 +351,28 @@ class BBJSONGenerator(object):
         a[key] = b[key]
     return a
 
-  def initialize_args_for_test(self, generated_test, tester_config):
-    if 'args' in tester_config or 'args' in generated_test:
-      generated_test['args'] = self.maybe_fixup_args_array(
-        generated_test.get('args', []) + tester_config.get('args', []))
+  def initialize_args_for_test(
+      self, generated_test, tester_config, additional_arg_keys=None):
+
+    args = []
+    args.extend(generated_test.get('args', []))
+    args.extend(tester_config.get('args', []))
 
     def add_conditional_args(key, fn):
-      if key in generated_test:
-        if fn(tester_config):
-          if not 'args' in generated_test:
-            generated_test['args'] = []
-          generated_test['args'] += generated_test[key]
-        # Don't put the conditional args in the JSON.
-        generated_test.pop(key)
+      val = generated_test.pop(key, [])
+      if fn(tester_config):
+        args.extend(val)
 
     add_conditional_args('desktop_args', lambda cfg: not self.is_android(cfg))
     add_conditional_args('linux_args', self.is_linux)
     add_conditional_args('android_args', self.is_android)
 
+    for key in additional_arg_keys or []:
+      args.extend(generated_test.pop(key, []))
+      args.extend(tester_config.get(key, []))
+
+    if args:
+      generated_test['args'] = self.maybe_fixup_args_array(args)
 
   def initialize_swarming_dictionary_for_test(self, generated_test,
                                               tester_config):
@@ -444,7 +448,9 @@ class BBJSONGenerator(object):
     else:
       result['test'] = test_name
     self.initialize_swarming_dictionary_for_test(result, tester_config)
-    self.initialize_args_for_test(result, tester_config)
+
+    self.initialize_args_for_test(
+        result, tester_config, additional_arg_keys=['gtest_args'])
     if self.is_android(tester_config) and tester_config.get('use_swarming',
                                                             True):
       args = result.get('args', [])

testing/buildbot/test_suite_exceptions.pyl

@@ -1355,6 +1355,12 @@
           '--additional-driver-flag=--enable-blink-features=HeapIncrementalMarkingStress',
         ],
       },
+      'linux-blink-heap-unified-gc': {
+        'args': [
+          '--debug',
+          '--additional-driver-flag=--enable-blink-features=HeapUnifiedGarbageCollection',
+        ],
+      },
       'mac10.10-blink-rel-dummy': {
         'swarming': {
           'dimension_sets': [

testing/buildbot/waterfalls.pyl

@@ -2431,12 +2431,6 @@
           'gtest_tests': 'linux_arm_gtests',
         },
       },
-      'linux-blink-heap-incremental-marking': {
-        'test_suites': {
-          'gtest_tests': 'chromium_gtests',
-          'isolated_scripts': 'chromium_webkit_isolated_scripts',
-        },
-      },
       'Linux Builder Goma Canary': {
         'additional_compile_targets': [
           'all',
@@ -2474,6 +2468,11 @@
           'gtest_tests': 'linux_viz_gtests',
         },
       },
+      'linux-annotator-rel': {
+        'test_suites': {
+          'scripts': 'test_traffic_annotation_auditor_script',
+        }
+      },
       'linux-blink-animation-use-time-delta': {
         'additional_compile_targets': [
           'all',
@@ -2483,16 +2482,26 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
-      'linux-annotator-rel': {
-        'test_suites': {
-          'scripts': 'test_traffic_annotation_auditor_script',
-        }
-      },
       'linux-blink-gen-property-trees': {
         'test_suites': {
           'isolated_scripts': 'webkit_layout_tests_isolated_scripts',
         },
       },
+      'linux-blink-heap-incremental-marking': {
+        'test_suites': {
+          'gtest_tests': 'chromium_gtests',
+          'isolated_scripts': 'chromium_webkit_isolated_scripts',
+        },
+      },
+      'linux-blink-heap-unified-gc': {
+        'test_suites': {
+          'gtest_tests': 'chromium_gtests',
+          'isolated_scripts': 'chromium_webkit_isolated_scripts',
+        },
+        'gtest_args': [
+          '--enable-blink-features=HeapUnifiedGarbageCollection',
+        ],
+      },
       'linux-blink-heap-verification': {
         'test_suites': {
           'gtest_tests': 'chromium_gtests',