Skip post upload hooks for new service accounts
NoTry: true
Bug: skia:7899
Change-Id: Id56fe8e0a52c76fed8a45ff4d12c0ee27a7215c8
Reviewed-on: https://skia-review.googlesource.com/125680
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 4149f86..f9747fa 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -35,11 +35,6 @@
'hcm@google.com',
)
-AUTO_COMMIT_BOTS = (
- 'update-docs@skia.org',
- 'update-skps@skia.org'
-)
-
AUTHORS_FILE_NAME = 'AUTHORS'
DOCS_PREVIEW_URL = 'https://skia.org/?cl='
@@ -505,11 +500,12 @@
issue = cl.issue
if issue:
- # Skip PostUploadHooks for all auto-commit bots. New patchsets (caused
- # due to PostUploadHooks) invalidates the CQ+2 vote from the
- # "--use-commit-queue" flag to "git cl upload".
- if cl.GetIssueOwner() in AUTO_COMMIT_BOTS:
- return results
+ # Skip PostUploadHooks for all auto-commit service account bots. New
+ # patchsets (caused due to PostUploadHooks) invalidates the CQ+2 vote from
+ # the "--use-commit-queue" flag to "git cl upload".
+ for suffix in SERVICE_ACCOUNT_SUFFIX:
+ if cl.GetIssueOwner().endswith(suffix):
+ return results
original_description_lines, footers = cl.GetDescriptionFooters()
new_description_lines = list(original_description_lines)