diff options
author | Ravi Mistry <rmistry@google.com> | 2018-02-14 08:24:27 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-14 14:00:57 +0000 |
commit | b8ea6fb50713edf9b27eff11905255e5199fc432 (patch) | |
tree | b3c5776ef64a45ac77f7661bae9671774c74780b /infra | |
parent | 36fa0ac9b5716cad25d60dcab98e3f127fb2a000 (diff) |
[Android Compile Bot] Check if patch/hash is not from origin/master
NoTry: true
Bug: skia:7615
Change-Id: I824ef67971195b0611cbcf7ce7ad0a289c4c55b9
Reviewed-on: https://skia-review.googlesource.com/106981
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra')
-rw-r--r-- | infra/bots/android_compile/trigger_wait_ac_task.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/infra/bots/android_compile/trigger_wait_ac_task.py b/infra/bots/android_compile/trigger_wait_ac_task.py index 9b74cd8e29..e5be7723c2 100644 --- a/infra/bots/android_compile/trigger_wait_ac_task.py +++ b/infra/bots/android_compile/trigger_wait_ac_task.py @@ -123,7 +123,12 @@ def TriggerAndWait(options): if ret["done"]: print print - if ret["withpatch_success"]: + if not ret.get("is_master_branch", True): + print 'The Android Framework Compile bot only works for patches and' + print 'hashes from the master branch.' + print + return 0 + elif ret["withpatch_success"]: print 'Your run was successfully completed.' print print 'With patch logs are here: %s' % ret["withpatch_log"] |