From 86c8ad954b6004a1e5dfa0072893b9e7ce428a97 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Thu, 7 Feb 2019 00:54:28 +0100 Subject: [PATCH] Pause rolling buildtools This is done to un-break the roller script, so other deps can be rolled for now. Example failure: https://ci.chromium.org/p/webrtc/builders/luci.webrtc.cron/Auto-roll%20-%20WebRTC%20DEPS/3040 chromium/buildtools is obsolete, to be replaced with chromium/src/buildtools when the subtree mirror is available. No-Try: True Bug: chromium:927867 Change-Id: I340b7d0a79dcb68d9c9e321c2da20476005625f2 Reviewed-on: https://webrtc-review.googlesource.com/c/121701 Commit-Queue: Artem Titarenko Reviewed-by: Mirko Bonadei Reviewed-by: Artem Titarenko Cr-Commit-Position: refs/heads/master@{#26580} --- tools_webrtc/autoroller/roll_deps.py | 2 ++ tools_webrtc/autoroller/unittests/roll_deps_test.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 45a3a94180..9259b44dca 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -28,6 +28,8 @@ def FindSrcDirPath(): # Skip these dependencies (list without solution name prefix). DONT_AUTOROLL_THESE = [ + # TODO(crbug.com/927867): resume rolling this as chromium/src/buildtools. + 'src/buildtools', 'src/examples/androidtests/third_party/gradle', ] diff --git a/tools_webrtc/autoroller/unittests/roll_deps_test.py b/tools_webrtc/autoroller/unittests/roll_deps_test.py index 33efe09087..68e6d62d37 100755 --- a/tools_webrtc/autoroller/unittests/roll_deps_test.py +++ b/tools_webrtc/autoroller/unittests/roll_deps_test.py @@ -24,6 +24,9 @@ from roll_deps import CalculateChangedDeps, FindAddedDeps, \ GetMatchingDepsEntries, ParseDepsDict, ParseLocalDepsFile, UpdateDepsFile, \ ChromiumRevisionUpdate +# HACK to avoid updating unittests just because buildtools roll is disabled. +roll_deps.DONT_AUTOROLL_THESE.remove('src/buildtools') + SRC_DIR = os.path.join(PARENT_DIR, os.pardir, os.pardir) sys.path.append(os.path.join(SRC_DIR, 'third_party', 'pymock')) import mock