Merge lp:~sil2100/ubuntu-cdimage/pass_build_id into lp:ubuntu-cdimage

[Łukasz Zemczak]

Pass the build timestamp to the livefs builder, so it can be used for things like .disk/info.

Pass the build timestamp to the livefs builder, so it can be used for things like .disk/info.

I'm really bad at naming, so if anyone thinks that build_id is *not* the right way to call this parameter, please shout (we'll have to change it in all the various places then). Just seemed to fit as this is how it's *sometimes* called on cdimage.

This way we can have something like .disk/info on our preinstalled images built by ubuntu-image, which would make it much easier for users and testers to identify which image they are using.

This MP is part of a set of changes in ubuntu-image, livecd-rootfs and launchpad-buildd.

[Dave Jones (waveform)]

Looks fine (it did look odd to me, assuming CDIMAGE_DATE is definitely in the config dict, but it seems common throughout the codebase and it is set unconditionally via build_image_set). All tests passing.

I can't think of a better name than build_id either (it could be "build_timestamp" to indicate it's a timestamp, but then that's not the actual intention which is to identify a particular build, regardless of whether it's done via a timestamp or otherwise).

review: Approve

[lp:~sil2100/ubuntu-cdimage/pass_build_id]

1831. By Łukasz Zemczak on 2020-01-15

Switch the name to image_build_id

1832. By Łukasz Zemczak on 2020-01-16

Actually use the already existing datestamp parameter - I've been told by Colin that it was supposed to be used for this purpose exactly.

=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2019-12-23 10:45:00 +0000
+++ lib/cdimage/livefs.py	2020-01-16 16:49:34 +0000
@@ -224,6 +224,9 @@
 
         metadata_override["channel"] = config["CHANNEL"]
 
+    if config["CDIMAGE_DATE"]:
+        metadata_override["datestamp"] = config["CDIMAGE_DATE"]
+
     if metadata_override:
         kwargs["metadata_override"] = metadata_override