Disable swarming for tests where it's disabled on builder level (FYI masters)

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 1622 matching lines @@
   if 'test' in result:
     result['name'] = test
   else:
     result['test'] = test
   if (not tester_config['swarming']) and test in NON_SWARMED_GTESTS:
     # Need to override this result.
     result = copy.deepcopy(NON_SWARMED_GTESTS[test])
     result['name'] = test
   else:
     # Put the swarming dimensions in anyway. If the tester is later
     # swarmed, they will come in handy.

[Dirk Pranke, 2017/01/25 20:22:07]

this comment and the comment down on lines 1754-1755 are wrong now, right? Turns
out it did hurt :).

     if not 'swarming' in result:
       result['swarming'] = {}
     result['swarming'].update({
-      'can_use_on_swarming_builders': True,
+      'can_use_on_swarming_builders': tester_config['swarming'],
       'dimension_sets': tester_config['swarming_dimensions']
     })
     if is_android(tester_config):
       # Override the isolate target to get rid of any "_apk" suffix
       # that would be added by the recipes.
       if 'test' in result:
         result['override_isolate_target'] = result['test']
       else:
         result['override_isolate_target'] = result['name']
       # Integrate with the unified logcat system.
@@ skipping 87 matching lines @@
   # The step name must end in 'test' or 'tests' in order for the
   # results to automatically show up on the flakiness dashboard.
   # (At least, this was true some time ago.) Continue to use this
   # naming convention for the time being to minimize changes.
   step_name = test
   if not (step_name.endswith('test') or step_name.endswith('tests')):
     step_name = '%s_tests' % step_name
   # Prepend GPU-specific flags.
   swarming = {
     # Always say this is true regardless of whether the tester
     # supports swarming. It doesn't hurt.

[Ken Russell (switch to Gerrit), 2017/01/25 22:28:09]

Agree with Dirk's comment above. Please update this comment indicating that this
is the switch which determines how these tests are run. I'm not 100% sure about
the direction of this work but it sounds like the machine-level Swarming switch
is being removed.

-    'can_use_on_swarming_builders': True,
+    'can_use_on_swarming_builders': tester_config['swarming'],
     'dimension_sets': tester_config['swarming_dimensions']
   }
   if 'swarming' in test_config:
     swarming.update(test_config['swarming'])
   result = {
     'args': prefix_args + test_args,
     'isolate_name': isolate_name,
     'name': step_name,
     'swarming': swarming,
   }
@@ skipping 70 matching lines @@
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, 'chromium.gpu.fyi.json', True, False)
   generate_all_tests(WATERFALL, 'chromium.gpu.json', False, False)
   generate_all_tests(V8_FYI_WATERFALL, 'client.v8.fyi.json', True, True)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())