Reduce swarming priority of the ANGLE dEQP tests.

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index 36ab240e675de10294ee60932721a630b02763bd..2781c17cb0399d1477c2e5a351b67a40016f07a9 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -481,7 +481,11 @@ COMMON_GTESTS = {
         ],
       },
     ],
-    'swarming_shards': 4
+    'swarming': {
+      'shards': 4,
+      'priority_adjustment': 'lower',
+      'expiration': 7200
+    }
   },
 
   'angle_deqp_gles3_tests': {
@@ -506,7 +510,11 @@ COMMON_GTESTS = {
         ],
       }
     ],
-    'swarming_shards': 12
+    'swarming': {
+      'shards': 12,
+      'priority_adjustment': 'lower',
+      'expiration': 7200
+    }
   },
 
   # Until we have more capacity, run angle_end2end_tests only on the
@@ -789,15 +797,14 @@ def generate_gtest(tester_name, tester_config, test, test_config, is_fyi):
   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
@@ -886,18 +893,13 @@ def generate_all_tests(waterfall, is_fyi):
   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'