Make beaglebone_servo images build updates for base images.

By default, if a test image is built, the builder creates the
update.gz file from that test image.  This is the wrong thing for
beaglebone_servo:  we want the base image, not the test image.

This fixes builds to include a new config option for specifying
which build should be the source for non-paygen update payload
generation.  By default, it chooses according to the old rules,
but if the option is provided it overrides the default.

BUG=None
TEST=Unit tests

Change-Id: I5f7460a614cf48f7a5cfcf8b1caf764fa9ae31fc
Reviewed-on: https://chromium-review.googlesource.com/269836
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/cbuildbot/generate_chromeos_config.py b/cbuildbot/generate_chromeos_config.py
index 29e7b0b3a..41839f4f5 100644
--- a/cbuildbot/generate_chromeos_config.py
+++ b/cbuildbot/generate_chromeos_config.py
@@ -503,6 +503,10 @@ _settings = dict(
 # images -- List of images we want to build -- see build_image for more details.
   images=['test'],
 
+# payload_image -- Image from which we will build update payloads.  Must
+# either be None or name one of the images in the 'images' list, above.
+  payload_image=None,
+
 # factory_install_netboot -- Whether to build a netboot image.
   factory_install_netboot=True,
 
@@ -2703,6 +2707,7 @@ BuildConfig.add_group('beaglebone-release-group',
   ),
   _beaglebone_release.add_config('beaglebone_servo-release',
     boards=['beaglebone_servo'],
+    payload_image='base'
   ).derive(_grouped_variant_config),
   important=True,
 )