commit 8534885512b04a7db6800143f23b61706fd27527
author Matt Tennant <mtennant@chromium.org> Fri Jan 10 15:16:02 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jan 14 20:36:22 2014 +0000
tree e231bf43ed6fae866aa7bcd5f71d0f2a3259818c
parent ae8dfce3f88b2a7662f2178c2fba3c8a5df383dc

cbuildbot: Add chrome_version as a run attribute.

This change adds a new run attribute called "chrome_version" which is
available after the SyncChromeStage runs.  Makes it easier for the
ReportStage to access the chrome_version, which is needed in some
upcoming work related to the bug listed here.

BUG=chromium:331594
TEST=unittest
TEST=`cbuildbot --remote daisy-full`

Change-Id: Ibcfb66eb472ee689c623f295864c8a938498457a
Reviewed-on: https://chromium-review.googlesource.com/182216
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Matt Tennant <mtennant@chromium.org>
Commit-Queue: Matt Tennant <mtennant@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index bcef772..3e2d272 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -226,7 +226,7 @@
     of the running chromite checkout.
 
     Args:
-      sync_instance:  Instance of the sync stage that was run to sync.
+      sync_instance: Instance of the sync stage that was run to sync.
 
     Returns:
       True if the Build succeeded.
@@ -494,13 +494,7 @@
     self._RunStage(stages.InitSDKStage)
     self._RunStage(stages.UprevStage)
     self._RunStage(stages.SetupBoardStage)
-
-    # We need a handle to this stage to extract info from it.
-    # TODO(mtennant): Just have _RunStage return the stage object, since
-    # nothing uses the return value of _RunStage now, and the Run method
-    # of stage objects does not appear to return anything, either.
-    sync_chrome_stage = self._GetStageInstance(stages.SyncChromeStage)
-    sync_chrome_stage.Run()
+    self._RunStage(stages.SyncChromeStage)
     self._RunStage(stages.PatchChromeStage)
 
     # Prepare stages to run in background.  If child_configs exist then
@@ -515,7 +509,7 @@
       for board in builder_run.config.boards:
         archive_stage = self._GetStageInstance(
             stages.ArchiveStage, board, builder_run=builder_run,
-            chrome_version=sync_chrome_stage.chrome_version)
+            chrome_version=self._run.attrs.chrome_version)
         board_config = BoardConfig(board, builder_run.config.name)
         self.archive_stages[board_config] = archive_stage
         tasks.append((builder_run, board, archive_stage))