From 6b90dfed6742b3e80d32fc0a7c32115c03198594 Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Mon, 12 Nov 2018 14:24:41 -0500 Subject: [PATCH] Remove usage of EnsureCQIncludeTrybotsAreAdded We will use path_regexes in the future in cq.cfg if required. NoTry: true Bug: skia:8542 Change-Id: Icdba5d3beee6e8b58a9b070b4db8c66cc8f71ac0 Reviewed-on: https://skia-review.googlesource.com/c/170355 Commit-Queue: Ravi Mistry Reviewed-by: Eric Boren --- PRESUBMIT.py | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index f16e11a990996..09d6e5df0298d 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -40,21 +40,6 @@ DOCS_PREVIEW_URL = 'https://skia.org/?cl=' GOLD_TRYBOT_URL = 'https://gold.skia.org/search?issue=' -# Path to CQ bots feature is described in https://bug.skia.org/4364 -PATH_PREFIX_TO_EXTRA_TRYBOTS = { - 'src/opts/': ('skia.primary:' - 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD'), - 'include/private/SkAtomics.h': ('skia.primary:' - 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN,' - 'Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN' - ), - - # Below are examples to show what is possible with this feature. - # 'src/svg/': 'master1:abc;master2:def', - # 'src/svg/parser/': 'master3:ghi,jkl;master4:mno', - # 'src/image/SkImage_Base.h': 'master5:pqr,stu;master1:abc1;master2:def', -} - SERVICE_ACCOUNT_SUFFIX = [ '@%s.iam.gserviceaccount.com' % project for project in [ 'skia-buildbots.google.com', 'skia-swarming-bots', 'skia-public', @@ -493,7 +478,6 @@ def PostUploadHook(cl, change, output_api): work on them. * Adds 'No-Presubmit: true' for non master branch changes since those don't run the presubmit checks. - * Adds extra trybots for the paths defined in PATH_TO_EXTRA_TRYBOTS. """ results = [] @@ -567,22 +551,6 @@ def PostUploadHook(cl, change, output_api): output_api.PresubmitNotifyResult( 'Branch changes do not run the presubmit checks.')) - # Automatically set Cq-Include-Trybots if any of the changed files here - # begin with the paths of interest. - bots_to_include = [] - for affected_file in change.AffectedFiles(): - affected_file_path = affected_file.LocalPath() - for path_prefix, extra_bots in PATH_PREFIX_TO_EXTRA_TRYBOTS.iteritems(): - if affected_file_path.startswith(path_prefix): - results.append( - output_api.PresubmitNotifyResult( - 'Your CL modifies the path %s.\nAutomatically adding %s to ' - 'the CL description.' % (affected_file_path, extra_bots))) - bots_to_include.append(extra_bots) - if bots_to_include: - output_api.EnsureCQIncludeTrybotsAreAdded( - cl, bots_to_include, new_description_lines) - # If the description has changed update it. if new_description_lines != original_description_lines: # Add a new line separating the new contents from the old contents.