Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1024)

Unified Diff: scripts/slave/bot_update.py

Issue 2000403004: bot_update: remove activation check for non-masters (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: force=True Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/bot_update.py
diff --git a/scripts/slave/bot_update.py b/scripts/slave/bot_update.py
index c209cfa7432027ca4d91e60431c67db0e46da2af..1d2db2c333e7b125c9b8ea7c463a44ffe7d6c9fa 100755
--- a/scripts/slave/bot_update.py
+++ b/scripts/slave/bot_update.py
@@ -1427,7 +1427,9 @@ def parse_args():
help='Gerrit repository to pull the ref from.')
parse.add_option('--gerrit_ref', help='Gerrit ref to apply.')
parse.add_option('--specs', help='Gcilent spec.')
- parse.add_option('--master', help='Master name.')
+ parse.add_option('--master',
+ help='Master name. If specified and it is not in '
+ 'bot_update\'s whitelist, bot_update will be noop.')
parse.add_option('-f', '--force', action='store_true',
help='Bypass check to see if we want to be run. '
'Should ONLY be used locally or by smart recipes.')
@@ -1685,8 +1687,13 @@ def main():
slave = options.slave_name
master = options.master
+ if not master:
+ # bot_update activation whitelist is checked only on buildbot masters.
+ # If there is no master, bot_update is always active.
+ options.force = True
+
# Check if this script should activate or not.
- active = check_valid_host(master, builder, slave) or options.force or False
+ active = options.force or check_valid_host(master, builder, slave)
# Print a helpful message to tell developers whats going on with this step.
print_help_text(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698