Add a new option '--schedv2' so later invocation to crosperf uses the new scheduler.

This option is added to buildbot_test_toolchains.py & test_toolchains.py.

TEST=None

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

1 files changed, 17 insertions, 4 deletions

diff --git a/test_toolchains.py b/test_toolchains.py
index 47170899..033f3ec7 100755
--- a/test_toolchains.py
+++ b/test_toolchains.py
@@ -146,7 +146,8 @@ class ChromeOSCheckout(object):
 
 
 class ToolchainComparator(ChromeOSCheckout):
-  def __init__(self, board, remotes, configs, clean, public, force_mismatch):
+  def __init__(self, board, remotes, configs, clean,
+               public, force_mismatch, schedv2=False):
     self._board = board
     self._remotes = remotes
     self._chromeos_root = "chromeos"
@@ -162,6 +163,7 @@ class ToolchainComparator(ChromeOSCheckout):
         os.path.expanduser("~/nightly_test_reports"),
         "%s.%s" % (timestamp, board),
         )
+    self._schedv2 = schedv2
     ChromeOSCheckout.__init__(self, board, self._chromeos_root)
 
 
@@ -241,8 +243,13 @@ class ToolchainComparator(ChromeOSCheckout):
     crosperf = os.path.join(os.path.dirname(__file__),
                             "crosperf",
                             "crosperf")
-    command = ("%s --no_email=True --results_dir=%s %s" %
-               (crosperf, self._reports_dir, experiment_file))
+    schedv2_opts = '--schedv2 --logging_level=verbose' if self._schedv2 else ''
+    command = ("{crosperf} --no_email=True --results_dir={r_dir} "
+               "{schedv2_opts} {exp_file}").format(
+                crosperf=crosperf,
+                r_dir=self._reports_dir,
+                schedv2_opts=schedv2_opts,
+                exp_file=experiment_file)
 
     ret = self._ce.RunCommand(command)
     if ret != 0:
@@ -352,6 +359,11 @@ def Main(argv):
                     dest="force_mismatch",
                     default="",
                     help="Force the image regardless of board mismatch")
+  parser.add_option("--schedv2",
+                    dest="schedv2",
+                    action="store_true",
+                    default=False,
+                    help="Pass --schedv2 to crosperf.")
   options, _ = parser.parse_args(argv)
   if not options.board:
     print "Please give a board."
@@ -366,7 +378,8 @@ def Main(argv):
     toolchain_configs.append(toolchain_config)
   fc = ToolchainComparator(options.board, options.remote, toolchain_configs,
                            options.clean, options.public,
-                           options.force_mismatch)
+                           options.force_mismatch,
+                           options.schedv2)
   return fc.DoAll()