Move final cbuildbot_stages.py contents to stages/release_stages.py.
Yu-Ju refactored most of our stages into new files to keep sizes
managable, but kindly left the release stages behind to help me avoid
a nasty rebase. This moves the release stages into their new locations.
BUG=chromium:372468
TEST=pylint + unittests
Change-Id: I8fe7c16d6b3786e3e25c7f9608b7e9287ebfa761
Reviewed-on: https://chromium-review.googlesource.com/200685
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 67ac550..6f94a11 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -23,7 +23,6 @@
import traceback
from chromite.buildbot import cbuildbot_config
-from chromite.buildbot import cbuildbot_stages as stages
from chromite.buildbot import cbuildbot_failures as failures_lib
from chromite.buildbot import cbuildbot_results as results_lib
from chromite.buildbot import cbuildbot_run
@@ -39,6 +38,7 @@
from chromite.buildbot.stages import chrome_stages
from chromite.buildbot.stages import completion_stages
from chromite.buildbot.stages import generic_stages
+from chromite.buildbot.stages import release_stages
from chromite.buildbot.stages import report_stages
from chromite.buildbot.stages import sdk_stages
from chromite.buildbot.stages import sync_stages
@@ -520,9 +520,9 @@
board]]
stage_list += [
- [stages.SignerTestStage, board, archive_stage],
+ [release_stages.SignerTestStage, board, archive_stage],
[generic_stages.RetryStage, 1,
- stages.PaygenStage, board, archive_stage],
+ release_stages.PaygenStage, board, archive_stage],
[test_stages.UnitTestStage, board],
[artifact_stages.UploadPrebuiltsStage, board],
[artifact_stages.DevInstallerPrebuiltsStage, board],
@@ -575,7 +575,7 @@
def _RunPayloadsBuild(self):
"""Run the PaygenStage once for each board."""
def _RunStageWrapper(board):
- self._RunStage(stages.PaygenStage, board=board,
+ self._RunStage(release_stages.PaygenStage, board=board,
channels=self._run.options.channels, archive_stage=None)
with parallel.BackgroundTaskRunner(_RunStageWrapper) as queue: