Move canary builders to to use the new BVT suites.
Canary builders now run the 'bvt-inline' and 'au' test suites
synchronously, in order. Then, the 'bvt-cq' and 'bvt-perbuild'
suites run asynchronously, in parallel.
BUG=chromium:397355
TEST=trybot runs, unit tests
Change-Id: If5155d70c5052e064ec69a52f7a827a966f09eaa
Reviewed-on: https://chromium-review.googlesource.com/210372
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 1222deb..75bf984 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -469,16 +469,15 @@
stage_class = test_stages.ASyncHWTestStage
elif suite_config.suite == constants.HWTEST_AU_SUITE:
stage_class = test_stages.AUTestStage
- elif suite_config.suite == constants.HWTEST_QAV_SUITE:
- stage_class = test_stages.QATestStage
else:
stage_class = test_stages.HWTestStage
- new_stage = self._GetStageInstance(stage_class, board,
- suite_config,
- builder_run=builder_run)
if suite_config.blocking:
- new_stage.Run()
+ self._RunStage(stage_class, board, suite_config,
+ builder_run=builder_run)
else:
+ new_stage = self._GetStageInstance(stage_class, board,
+ suite_config,
+ builder_run=builder_run)
parallel_stages.append(new_stage)
self._RunParallelStages(parallel_stages)