Merge lp:~codyshepherd/livecd-rootfs/snaps-manifest into lp:livecd-rootfs

[Cody Shepherd]

These changes ensure pre-seeded snaps are included in the image manifests.

Test builds have confirmed that manifests now include lines for snaps.

[Robert C Jennings (rcj)]

This has been tested and used to provide snaps in the manifests for cosmic cloud-images. +1

review: Approve

[Steve Langasek (vorlon)]

review: Needs Fixing

[Steve Langasek (vorlon)]

oops, meant for that to be a core-dev review rather than a cloudware review.

[Cody Shepherd (codyshepherd)]

Thanks Steve! I pushed a couple changes in response to your comments.

[lp:~codyshepherd/livecd-rootfs/snaps-manifest]

1706. By Steve Langasek on 2018-10-26

Merge lp:~codyshepherd/livecd-rootfs/snaps-manifest

=== modified file 'debian/changelog'
--- debian/changelog	2018-10-12 12:19:18 +0000
+++ debian/changelog	2018-10-23 17:34:18 +0000
@@ -1,3 +1,9 @@
+livecd-rootfs (2.543) UNRELEASED; urgency=medium
+
+  * Ensure pre-seeded snaps are now published in the image manifests.
+
+ -- Cody Shepherd <[e-mail]>  Mon, 22 Oct 2018 10:16:19 -0700
+
 livecd-rootfs (2.542) cosmic; urgency=medium
 
   * Decide what model assertion series to fetch depending on the suite. Use 16

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2018-09-26 00:42:42 +0000
+++ live-build/auto/build	2018-10-23 17:34:18 +0000
@@ -551,6 +551,7 @@
 
 # '--initramfs none' produces different manifest names.
 if [ -e "binary/$INITFS/filesystem.packages" ]; then
+	./config/snap-seed-parse "chroot/" >> "binary/${INITFS}/filesystem.packages"
 	ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
 	chmod 644 "$PREFIX.manifest"
 fi

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2018-10-11 15:12:50 +0000
+++ live-build/auto/config	2018-10-23 17:34:18 +0000
@@ -33,6 +33,7 @@
 
 mkdir -p config
 cp -af /usr/share/livecd-rootfs/live-build/functions config/functions
+cp -af /usr/share/livecd-rootfs/live-build/snap-seed-parse.py config/snap-seed-parse
 
 mkdir -p config/package-lists
 

=== modified file 'live-build/functions'
--- live-build/functions	2018-09-27 20:15:55 +0000
+++ live-build/functions	2018-10-23 17:34:18 +0000
@@ -43,6 +43,17 @@
     dd if=/dev/zero of="$1" bs=1 count=0 seek="${imagesize}"
 }
 
+create_manifest() {
+    local chroot_root=${1}
+    local target_file=${2}
+    echo "create_manifest chroot_root: ${chroot_root}"
+    dpkg-query --show --admindir="${chroot_root}/var/lib/dpkg" > ${target_file}
+    echo "create_manifest call to dpkg-query finished."
+    ./config/snap-seed-parse "${chroot_root}" >> ${target_file}
+    echo "create_manifest call to snap_seed_parse finished."
+    echo "create_manifest finished"
+}
+
 make_ext4_partition() {
     device="$1"
     label=${fs_label:+-L "${fs_label}"}

=== added file 'live-build/snap-seed-parse.py'
--- live-build/snap-seed-parse.py	1970-01-01 00:00:00 +0000
+++ live-build/snap-seed-parse.py	2018-10-23 17:34:18 +0000
@@ -0,0 +1,56 @@
+#!/usr/bin/python3
+
+"""
+Usage: snap-seed-parse ${chroot_dir} > somefile.manifest
+
+This script looks for a seed.yaml path in the given root directory, parsing
+it and printing generated manifest lines to stdout for easy redirection.
+"""
+
+import re
+import sys
+import yaml
+import os.path
+
+
+def log(msg):
+    sys.stderr.write("snap-seed-parse: {}\n".format(msg))
+
+
+log("Parsing seed.yaml")
+
+CHROOT_ROOT = sys.argv[1] if len(sys.argv) > 1 and len(sys.argv[1]) > 0 \
+                          else ''
+
+# Trim any trailing slashes for correct appending
+log("CHROOT_ROOT: {}".format(CHROOT_ROOT))
+if len(CHROOT_ROOT) > 0 and CHROOT_ROOT[-1] == '/':
+    CHROOT_ROOT = CHROOT_ROOT[:-1]
+
+# This is where we expect to find the seed.yaml file
+YAML_PATH = CHROOT_ROOT + '/var/lib/snapd/seed/seed.yaml'
+
+# Snaps are prepended with this string in the manifest
+LINE_PREFIX = 'snap:'
+
+log("yaml path: {}".format(YAML_PATH))
+if not os.path.isfile(YAML_PATH):
+    log("WARNING: yaml path not found; no seeded snaps found.")
+    exit(0)
+else:
+    log("yaml path found.")
+
+with open(YAML_PATH, 'r') as fh:
+    yaml_lines = yaml.safe_load(fh)['snaps']
+
+# Loop over dict items, outputting one manifest line from each triplet
+for item in yaml_lines:
+    filestring = item['file']
+    # Pull the revision number off the file name
+    revision = filestring[filestring.rindex('_')+1:]
+    revision = re.sub(r'[^0-9]', '', revision)
+    print("{}{}\t{}\t{}".format(LINE_PREFIX,
+                                        item['name'],
+                                        item['channel'],
+                                        revision,
+                                        ))

=== modified file 'live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary'
--- live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary	2018-09-20 11:37:25 +0000
+++ live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary	2018-10-23 17:34:18 +0000
@@ -26,4 +26,4 @@
 
 teardown_mountpoint $rootfs_dir
 
-dpkg-query --admindir=$rootfs_dir/var/lib/dpkg -W > $rootfs_dir.manifest
+create_manifest "${rootfs_dir}" "${rootfs_dir}.manifest"

=== modified file 'live-build/ubuntu-server/hooks/030-root-squashfs.binary'
--- live-build/ubuntu-server/hooks/030-root-squashfs.binary	2017-06-14 16:25:11 +0000
+++ live-build/ubuntu-server/hooks/030-root-squashfs.binary	2018-10-23 17:34:18 +0000
@@ -28,7 +28,7 @@
 squashfs_f="${PWD}/livecd.${PROJECT}.squashfs"
 squashfs_f_manifest="${squashfs_f}.manifest"
 
-dpkg-query --admindir=binary/boot/squashfs.dir/var/lib/dpkg -W > ${squashfs_f_manifest}
+create_manifest "binary/boot/squashfs.dir" "${squashfs_f_manifest}"
 
 (cd "binary/boot/squashfs.dir/" &&
       mksquashfs . ${squashfs_f} \