Merge lp:~vorlon/launchpad-buildd/image-targets into lp:launchpad-buildd

[Steve Langasek]

The ubuntu-cpc project is unusual in that for a single project, it produces multiple image outputs, each of which can be fairly time consuming to build. By default we want the ubuntu-cpc build to produce the full set of relevant images for the architecture, but I would find it useful to be able to specify (especially when iterating during development) that I only want a subset of images produced.

This branch proposes a syntax for passing that information through launchpad-buildd into the hook scripts via the environment. See https://code.launchpad.net/~vorlon/livecd-rootfs/image-flavors/+merge/316530 for a corresponding livecd-rootfs change.

This is distinct from subarch, as we could legitimately have both a kernel subarchitecture type and a cloud target specified as part of a single build; also, we can't legitimately pass multiple subarch options to a single build.

It is also distinct from --image-format, which is mapped to live-build's --chroot-filesystem within livecd-rootfs.

[Colin Watson (cjwatson)]

This is basically fine, but I'm afraid you've missed a layer of marshalling here. I'm assuming you want to be able to set an "image_targets" list from Launchpad, and for that to work you also need to change lpbuildd/livefs.py to marshal those into --image-target arguments to buildlivefs.

review: Needs Fixing

[Tobias Koch (tobijk)]

Picking this up again in https://code.launchpad.net/~tobijk/launchpad-buildd/image-targets/+merge/356304

[Colin Watson (cjwatson)]

This is effectively merged now as part of Tobias's MP.

=== modified file 'buildlivefs'
--- buildlivefs	2016-12-09 18:04:00 +0000
+++ buildlivefs	2017-02-07 22:32:49 +0000
@@ -119,6 +119,9 @@
                 lb_env["NOW"] = self.options.datestamp
             if self.options.image_format is not None:
                 lb_env["IMAGEFORMAT"] = self.options.image_format
+            if self.options.image_targets is not None:
+                base_lb_env["IMAGE_TARGETS"] = " ".join(
+                    self.options.image_targets)
             if self.options.proposed:
                 lb_env["PROPOSED"] = "1"
             if self.options.extra_ppas:
@@ -146,6 +149,9 @@
     parser.add_option(
         "--image-format", metavar="FORMAT", help="produce an image in FORMAT")
     parser.add_option(
+        "--image-target", dest="image_targets", default=[], action="append",
+        metavar="TARGET", help="produce image for TARGET")
+    parser.add_option(
         "--proposed", default=False, action="store_true",
         help="enable use of -proposed pocket")
     parser.add_option(

=== modified file 'debian/changelog'
--- debian/changelog	2016-12-09 18:05:21 +0000
+++ debian/changelog	2017-02-07 22:32:49 +0000
@@ -1,5 +1,6 @@
 launchpad-buildd (142) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * lpbuildd.binarypackage: Pass DEB_BUILD_OPTIONS=noautodbgsym if we have
     not been told to build debug symbols (LP: #1623256).
   * debian/upgrade-config, lpbuildd.slave: Drop compatibility with ancient
@@ -8,6 +9,12 @@
     string/file conditional from ConfigFile.__init__.
   * Use Python-3-compatible forms of "print" and "except".
 
+  [ Steve Langasek ]
+  * buildlivefs: support passing an IMAGE_TARGETS variable into the
+    environment, for projects (i.e., ubuntu-cpc) that produce multiple
+    images as part of a single build, in order to be selective about what
+    builds to run.
+
  -- Colin Watson <[e-mail]>  Fri, 09 Dec 2016 16:15:49 +0000
 
 launchpad-buildd (141) trusty; urgency=medium