Make new scheduler the default.

This CL also add a new option '--noschedv2' to use the original
scheduler in case of bugs in the new scheduler.

Change-Id: I11ddefe7e7c1162019e9ad72ed3cef0b962b4d06
Reviewed-on: https://chrome-internal-review.googlesource.com/230484
Commit-Ready: Han Shen <shenhan@google.com>
Tested-by: Han Shen <shenhan@google.com>
Reviewed-by: Caroline Tice <cmtice@google.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py
index d3ca176b..94788da8 100755
--- a/buildbot_test_toolchains.py
+++ b/buildbot_test_toolchains.py
@@ -44,7 +44,7 @@ class ToolchainComparator():
   Class for doing the nightly tests work.
   """
 
-  def __init__(self, board, remotes, chromeos_root, weekday, patches, schedv2=False):
+  def __init__(self, board, remotes, chromeos_root, weekday, patches, noschedv2=False):
     self._board = board
     self._remotes = remotes
     self._chromeos_root = chromeos_root
@@ -54,7 +54,7 @@ class ToolchainComparator():
     self._build = "%s-release" % board
     self._patches = patches.split(',')
     self._patches_string = '_'.join(str(p) for p in self._patches)
-    self._schedv2 = schedv2
+    self._noschedv2 = noschedv2
 
     if not weekday:
       self._weekday = time.strftime("%a")
@@ -142,12 +142,12 @@ class ToolchainComparator():
     crosperf = os.path.join(TOOLCHAIN_DIR,
                             "crosperf",
                             "crosperf")
-    schedv2_opts = '--schedv2 --logging_level=verbose' if self._schedv2 else ''
+    noschedv2_opts = '--noschedv2' if self._noschedv2 else ''
     command = ("{crosperf} --no_email=True --results_dir={r_dir} "
-               "--json_report=True {schedv2_opts} {exp_file}").format(
+               "--json_report=True {noschedv2_opts} {exp_file}").format(
                 crosperf=crosperf,
                 r_dir=self._reports_dir,
-                schedv2_opts=schedv2_opts,
+                noschedv2_opts=noschedv2_opts,
                 exp_file=experiment_file)
 
     ret = self._ce.RunCommand(command)
@@ -289,11 +289,11 @@ def Main(argv):
                     help="The patches to use for the testing, "
                     "seprate the patch numbers with ',' "
                     "for more than one patches.")
-  parser.add_option("--schedv2",
-                    dest="schedv2",
+  parser.add_option("--noschedv2",
+                    dest="noschedv2",
                     action="store_true",
                     default=False,
-                    help="Pass --schedv2 to crosperf.")
+                    help="Pass --noschedv2 to crosperf.")
 
   options, _ = parser.parse_args(argv)
   if not options.board:
@@ -312,7 +312,7 @@ def Main(argv):
 
   fc = ToolchainComparator(options.board, options.remote,
                            options.chromeos_root, options.weekday, patches,
-                           options.schedv2)
+                           options.noschedv2)
   return fc.DoAll()