Switch to using the boardless pfq master
The boardless master will be running MasterUploadPrebuiltsStage,
instead of the board-specific UploadPrebuiltsStage.
This CL needs to coincide with the corresponding waterfall change and
land during a scheduled down time.
BUG=chromium:363659
TEST=`cbuildbot --remote --buildbot --debug master-chromium-pfq`
Change-Id: Icd6ebc7c3f138ec805fe540af1d32898950ffc21
Reviewed-on: https://chromium-review.googlesource.com/210036
Tested-by: Yu-Ju Hong <yjhong@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 1d9e9a8..8d44659 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -601,11 +601,11 @@
self._RunSetupBoard()
self._RunStage(report_stages.RefreshPackageStatusStage)
- def _RunMasterPaladinBuild(self):
- """Runs through the stages of the paladin (commit queue) master build."""
+ def _RunMasterPaladinOrChromePFQBuild(self):
+ """Runs through the stages of the paladin or chrome PFQ master build."""
self._RunStage(build_stages.InitSDKStage)
self._RunStage(build_stages.UprevStage)
- # The CQ (paladin) master will not actually run the SyncChrome stage, but
+ # The CQ/Chrome PFQ master will not actually run the SyncChrome stage, but
# we want the logic that gets triggered when SyncChrome stage is skipped.
self._RunStage(chrome_stages.SyncChromeStage)
self._RunStage(artifact_stages.MasterUploadPrebuiltsStage)
@@ -693,9 +693,10 @@
self._RunChrootBuilderTypeBuild()
elif self._run.config.build_type == constants.REFRESH_PACKAGES_TYPE:
self._RunRefreshPackagesTypeBuild()
- elif (self._run.config.build_type == constants.PALADIN_TYPE and
+ elif ((self._run.config.build_type == constants.PALADIN_TYPE or
+ self._run.config.build_type == constants.CHROME_PFQ_TYPE) and
self._run.config.master):
- self._RunMasterPaladinBuild()
+ self._RunMasterPaladinOrChromePFQBuild()
elif self._run.config.build_type == constants.PAYLOADS_TYPE:
self._RunPayloadsBuild()
else: