Add a ChromeLKGMStage that syncs with the Chrome LKGM of Chrome OS.
Implements ChromeLKGMStage that grabs the Chrome OS version stored
in the Chrome LGKM for Chrome OS and sync's to it. In order to do this,
broke the svn url logic out of cros_mark_chrome_as_stable and added
a new config type until the workflow is well vetted.
BUG=chromium-os:36076
TEST=Ran it with a local build of lumpy-chrome-lkgm-perf + pylint +
unittests.
Change-Id: I509b6b193634f624fc7250f6e18c54834c7ea157
Reviewed-on: https://gerrit.chromium.org/gerrit/38022
Commit-Ready: Chris Sosa <sosa@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index b808dba..1b28a16 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -342,8 +342,10 @@
Returns: the instance of the sync stage that was run.
"""
- if self.options.lkgm or self.build_config['use_lkgm']:
+ if self.build_config['use_lkgm']:
sync_stage = self._GetStageInstance(stages.LKGMSyncStage)
+ elif self.build_config['use_chrome_lkgm']:
+ sync_stage = self._GetStageInstance(stages.ChromeLKGMSyncStage)
else:
sync_stage = self._GetStageInstance(stages.SyncStage)
@@ -552,7 +554,9 @@
return False
elif build_config['build_type'] in _DISTRIBUTED_TYPES:
chrome_rev = build_config['chrome_rev']
- if options.chrome_rev: chrome_rev = options.chrome_rev
+ if options.chrome_rev:
+ chrome_rev = options.chrome_rev
+
# We don't do distributed logic to TOT Chrome PFQ's, nor local
# chrome roots (e.g. chrome try bots)
if chrome_rev not in [constants.CHROME_REV_TOT,
@@ -782,10 +786,6 @@
group.add_remote_option('--hwtest', dest='hwtest', action='store_true',
default=False,
help='This adds HW test for remote trybot')
- group.add_remote_option('--lkgm', action='store_true', dest='lkgm',
- default=False,
- help='Sync to last known good manifest blessed by '
- 'PFQ')
parser.add_option('--log_dir', dest='log_dir', type='path',
help=('Directory where logs are stored.'))
group.add_remote_option('--maxarchives', dest='max_archive_builds',