commit 7ddc510e2703837dfd4ac4cf8e950979c9470310
author J. Richard Barnette <jrbarnette@chromium.org> Thu Jul 24 16:40:40 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jul 29 04:37:22 2014 +0000
tree 79cca5cc197547710bee00bbded9e8898bfbdd4e
parent 33edd8e27bac3f022808abfd3653d8079d5939be

Add the concept of a 'blocking' HWTest step.

Blocking HWTest steps are run sequentially; each step must complete
successfully before the next begins.  After all blocking steps have
completed successfully, non-blocking steps run in parallel.

BUG=chromium:397355
TEST=cbuildbot_config_unittest.py, trybot runs

Change-Id: I9ba327c0b8bfe835b4c08df62202b06b7edd8c9c
Reviewed-on: https://chromium-review.googlesource.com/209842
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 632e94e..cfd5395 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -459,23 +459,29 @@
     self._RunStage(artifact_stages.UploadTestArtifactsStage, board,
                    builder_run=builder_run)
 
-    # We can not run hw tests without archiving the payloads.
-    stage_list = []
-    config = builder_run.config
-    if builder_run.options.archive:
-      for suite_config in config.hw_tests:
-        if suite_config.async:
-          stage_list.append([test_stages.ASyncHWTestStage, board, suite_config])
-        elif suite_config.suite == constants.HWTEST_AU_SUITE:
-          stage_list.append([test_stages.AUTestStage, board, suite_config])
-        elif suite_config.suite == constants.HWTEST_QAV_SUITE:
-          stage_list.append([test_stages.QATestStage, board, suite_config])
-        else:
-          stage_list.append([test_stages.HWTestStage, board, suite_config])
+    parallel_stages = []
 
-    stage_objs = [self._GetStageInstance(*x, builder_run=builder_run)
-                  for x in stage_list]
-    self._RunParallelStages(stage_objs)
+    # We can not run hw tests without archiving the payloads.
+    if builder_run.options.archive:
+      for suite_config in builder_run.config.hw_tests:
+        stage_class = None
+        if suite_config.async:
+          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()
+        else:
+          parallel_stages.append(new_stage)
+
+    self._RunParallelStages(parallel_stages)
 
   def _RunBackgroundStagesForBoardAndMarkAsSuccessful(self, builder_run, board):
     """Run background board-specific stages for the specified board.