Reduce swarming priority of the ANGLE dEQP tests.

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 463 matching lines @@
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
           {
             'gpu': '10de:104a',
             'os': 'Linux'
           }
         ],
       },
     ],
-    'swarming_shards': 4
+    'swarming': {
+      'shards': 4,
+      'priority_adjustement': 'lower',

[Ken Russell (switch to Gerrit), 2016/03/28 18:06:53]

Typo here and throughout: this should be:
priority_adjustment

See https://codereview.chromium.org/1828573003 .

+      'expiration': 7200
+    }
   },
 
   'angle_deqp_gles3_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         # TODO(jmadill): Run this on the optional tryservers.
         'run_on_optional': False,
         # Run only on the Win7 and Linux Release NVIDIA 32-bit bots
         # (and trybots) for the time being, at least until more capacity is
         # added.
         'build_configs': ['Release'],
         'swarming_dimension_sets': [
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
           {
             'gpu': '10de:104a',
             'os': 'Linux'
           }
         ],
       }
     ],
-    'swarming_shards': 12
+    'swarming': {
+      'shards': 12,
+      'priority_adjustement': 'lower',
+      'expiration': 7200
+    }
   },
 
   # Until we have more capacity, run angle_end2end_tests only on the
   # FYI waterfall, the ANGLE trybots (which mirror the FYI waterfall),
   # and the optional trybots (mainly used during ANGLE rolls).
   'angle_end2end_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         'run_on_optional': True,
@@ skipping 262 matching lines @@
     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.
-    result['swarming'] = {
+    if not 'swarming' in result:
+      result['swarming'] = {}
+    result['swarming'].update({
       'can_use_on_swarming_builders': True,
       'dimension_sets': [
         tester_config['swarming_dimensions']
       ],
-    }
-    if result.get('swarming_shards'):
-      result['swarming']['shards'] = result['swarming_shards']
-      result.pop('swarming_shards')
+    })
   # This flag only has an effect on the Linux bots that run tests
   # locally (as opposed to via Swarming), which are only those couple
   # on the chromium.gpu.fyi waterfall. Still, there is no harm in
   # specifying it everywhere.
   result['use_xvfb'] = False
   return result
 
 def generate_telemetry_test(tester_name, tester_config,
                             test, test_config, is_fyi):
   if not should_run_on_tester(tester_name, tester_config, test_config, is_fyi):
@@ skipping 68 matching lines @@
         tester_name, tester_config, test_name, test_config, is_fyi)
     if test:
       isolated_scripts.append(test)
   return isolated_scripts
 
 def generate_all_tests(waterfall, is_fyi):
   tests = {}
   for builder in waterfall['builders']:
     tests[builder] = {}
   for name, config in waterfall['testers'].iteritems():
-    gtests = []
-    gtests.extend(generate_gtests(name, config, COMMON_GTESTS, is_fyi))
-    isolated_scripts = []
-    isolated_scripts.extend(generate_telemetry_tests(
-        name, config, TELEMETRY_TESTS, is_fyi))
-    cur_tests = {}
-    if gtests:
-      cur_tests['gtest_tests'] = sorted(gtests, key=lambda x: x['test'])
-    if isolated_scripts:
-      cur_tests['isolated_scripts'] = sorted(
-          isolated_scripts, key=lambda x: x['name'])
-    tests[name] = cur_tests
+    gtests = generate_gtests(name, config, COMMON_GTESTS, is_fyi)
+    isolated_scripts = \
+        generate_telemetry_tests(name, config, TELEMETRY_TESTS, is_fyi)
+    tests[name] = {
+      'gtest_tests': sorted(gtests, key=lambda x: x['test']),
+      'isolated_scripts': sorted(isolated_scripts, key=lambda x: x['name'])
+    }
   tests['AAAAA1 AUTOGENERATED FILE DO NOT EDIT'] = {}
   tests['AAAAA2 See generate_buildbot_json.py to make changes'] = {}
   filename = 'chromium.gpu.fyi.json' if is_fyi else 'chromium.gpu.json'
   with open(os.path.join(SRC_DIR, 'testing', 'buildbot', filename), 'w') as fp:
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())