From 4722a4135911c86abd3960014de8e476be90c97d Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Thu, 3 May 2018 08:02:03 -0400 Subject: 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 Reviewed-by: Eric Boren --- PRESUBMIT.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'PRESUBMIT.py') diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 4149f86e09..f9747fa1f6 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -35,11 +35,6 @@ PUBLIC_API_OWNERS = ( '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 @@ def PostUploadHook(cl, change, output_api): 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) -- cgit v1.2.3