diff options
| author | Yu-Ju Hong <yjhong@chromium.org> | 2014-05-20 15:51:24 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-05-21 04:17:39 +0000 |
| commit | 3f1792c19cf462eae97557b221fcd40e5e918ace (patch) | |
| tree | fd47d70462f36343336ef59383060fa3ec0d0672 /buildbot | |
| parent | be60b890928280f7d7d26f42ed6627671eb43cbe (diff) | |
| download | chromite-3f1792c19cf462eae97557b221fcd40e5e918ace.tar.gz | |
Skip Uprev/BuildImage stage properly with "Not running" message logged
BUG=chromium:375492
TEST=`buildbot/run_tests` passes
Change-Id: Ibc1f3b72562892f1422481d6a6d665de3fbb2064
Reviewed-on: https://chromium-review.googlesource.com/200662
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Yu-Ju Hong <yjhong@chromium.org>
Diffstat (limited to 'buildbot')
| -rw-r--r-- | buildbot/stages/build_stages.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/buildbot/stages/build_stages.py b/buildbot/stages/build_stages.py index 2318bbeeb..f9455d24b 100644 --- a/buildbot/stages/build_stages.py +++ b/buildbot/stages/build_stages.py @@ -242,6 +242,7 @@ class BuildImageStage(BuildPackagesStage): """Build standard Chromium OS images.""" option_name = 'build' + config_name = 'images' def _BuildImages(self): # We only build base, dev, and test images from this stage. @@ -302,8 +303,7 @@ class BuildImageStage(BuildPackagesStage): return super(BuildImageStage, self)._HandleStageException(exc_info) def PerformStage(self): - if self._run.config.images: - self._BuildImages() + self._BuildImages() class UprevStage(generic_stages.BuilderStage): @@ -311,6 +311,7 @@ class UprevStage(generic_stages.BuilderStage): validate. """ + config_name = 'uprev' option_name = 'uprev' def __init__(self, builder_run, boards=None, enter_chroot=True, **kwargs): @@ -321,9 +322,8 @@ class UprevStage(generic_stages.BuilderStage): def PerformStage(self): # Perform other uprevs. - if self._run.config.uprev: - overlays, _ = self._ExtractOverlays() - commands.UprevPackages(self._build_root, - self._boards, - overlays, - enter_chroot=self._enter_chroot) + overlays, _ = self._ExtractOverlays() + commands.UprevPackages(self._build_root, + self._boards, + overlays, + enter_chroot=self._enter_chroot) |