Rewrite presubmit scripts to use new EnsureCQIncludeTrybotsAreAdded.
BUG=688765
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:closure_compilation;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win10_chromium_x64_rel_ng;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Review-Url: https://codereview.chromium.org/2683103002
Cr-Commit-Position: refs/heads/master@{#451034}
diff --git a/gpu/PRESUBMIT.py b/gpu/PRESUBMIT.py
index d993bd90..7300f07c 100644
--- a/gpu/PRESUBMIT.py
+++ b/gpu/PRESUBMIT.py
@@ -8,33 +8,20 @@
for more details about the presubmit API built into depot_tools.
"""
-import re
-
def PostUploadHook(cl, change, output_api):
"""git cl upload will call this hook after the issue is created/modified.
- This hook adds extra try bots list to the CL description in order to run
- Blink tests in addition to CQ try bots.
+ This hook modifies the CL description in order to run extra GPU
+ tests (in particular, the WebGL 2.0 conformance tests) in addition
+ to the regular CQ try bots. This test suite is too large to run
+ against all Chromium commits, but should be run against changes
+ likely to affect these tests.
"""
- rietveld_obj = cl.RpcServer()
- issue = cl.issue
- description = rietveld_obj.get_description(issue)
- if re.search(r'^CQ_INCLUDE_TRYBOTS=.*', description, re.M | re.I):
- return []
-
- bots = [
- 'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel',
- 'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel',
- 'master.tryserver.chromium.win:win_optional_gpu_tests_rel',
- ]
-
- results = []
- new_description = description
- new_description += '\nCQ_INCLUDE_TRYBOTS=%s' % ';'.join(bots)
- results.append(output_api.PresubmitNotifyResult(
- 'Automatically added optional GPU tests to run on CQ.'))
-
- if new_description != description:
- rietveld_obj.update_description(issue, new_description)
-
- return results
+ return output_api.EnsureCQIncludeTrybotsAreAdded(
+ cl,
+ [
+ 'master.tryserver.chromium.linux:linux_optional_gpu_tests_rel',
+ 'master.tryserver.chromium.mac:mac_optional_gpu_tests_rel',
+ 'master.tryserver.chromium.win:win_optional_gpu_tests_rel',
+ ],
+ 'Automatically added optional GPU tests to run on CQ.')
