Enable checking for cgroups availability for remote trybots.
So we can confidently turn off auto-reboot for trybots.
BUG=chromium-os:28992
TEST=remote trybot
Change-Id: Ib812ca23674e093c7a32ac93569268338b162b3f
Reviewed-on: https://gerrit.chromium.org/gerrit/19627
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Ryan Cui <rcui@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 9918477..e7c4920 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -935,13 +935,15 @@
parser.error('Reference path %s does not look to be the base of a '
'repo checkout; no .repo exists in the root.'
% (options.reference_repo,))
- if options.buildbot:
+
+ if options.buildbot or options.remote_trybot:
if not options.cgroups:
- parser.error('Options --buildbot and --nocgroups cannot be used '
- 'together. Cgroup support is required for buildbot mode.')
+ parser.error('Options --buildbot/--remote-trybot and --nocgroups cannot '
+ 'be used together. Cgroup support is required for '
+ 'buildbot/remote-trybot mode.')
if not cgroups.Cgroup.CgroupsSupported():
- parser.error('Option --buildbot was given, but this system does not '
- 'support cgroups. Failing.')
+ parser.error('Option --buildbot/--remote-trybot was given, but this '
+ 'system does not support cgroups. Failing.')
missing = []
for program in _BUILDBOT_REQUIRED_BINARIES:
@@ -952,8 +954,8 @@
missing.append(program)
if missing:
- parser.error("Option --buildbot requires the following binaries which "
- "couldn't be found in $PATH: %s"
+ parser.error("Option --buildbot/--remote-trybot requires the following "
+ "binaries which couldn't be found in $PATH: %s"
% (', '.join(missing)))
if options.reference_repo: