Merge lp:~vorlon/livecd-rootfs/ubuntu-channels-for-snaps into lp:livecd-rootfs

[Steve Langasek]

[Iain Lane (laney)]

Yeah, the current implementation isn't compliant with the spec.

Few questions inline, nothing major.

When ready to upload, please check the seeds to make sure nothing will fail to build due to this. For example I know that desktop is seeding snap:gnome-calculator ATM and it'll need to be published to the new channel.

[Iain Lane (laney)]

review: Needs Information

[Iain Lane (laney)]

> it'll need to be published to the new channel.

Ken says it has been. :-)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks generally good to me, provided the channels are present.

However, I thought stuff on non-existent channels were not falling back automatically?

review: Needs Information

=== modified file 'debian/changelog'
--- debian/changelog	2018-02-14 20:54:21 +0000
+++ debian/changelog	2018-02-16 22:09:43 +0000
@@ -1,3 +1,10 @@
+livecd-rootfs (2.504) UNRELEASED; urgency=medium
+
+  * Use Ubuntu-specific branches when seeding snaps, as required in
+    <https://wiki.ubuntu.com/UbuntuSeededSnaps>.
+
+ -- Steve Langasek <[e-mail]>  Fri, 16 Feb 2018 14:02:49 -0800
+
 livecd-rootfs (2.503) bionic; urgency=medium
 
   * Install linux-signed-generic in the live-server image. (LP: #1749065)
 
=== modified file 'live-build/auto/build'
--- live-build/auto/build	2018-01-30 10:16:36 +0000
+++ live-build/auto/build	2018-02-16 22:09:43 +0000
@@ -35,6 +35,8 @@
 
 preinstall_snaps() {
 	lb chroot_resolv install
+	snap_channel="stable/ubuntu-$(distro-info --series="$LB_DISTRIBUTION" \
+	                              -r | awk '{ print $1 }')"
 	chroot chroot sh -c '
 		set -x;
 		cd /var/lib/snapd/seed;
@@ -43,7 +45,7 @@
 		chroot chroot sh -c "
 			set -x;
 			cd /var/lib/snapd/seed;
-			SNAPPY_STORE_NO_CDN=1 snap download \"${snap%/*}\""
+			SNAPPY_STORE_NO_CDN=1 snap download --channel=$snap_channel \"${snap%/*}\""
 	done
 	lb chroot_resolv remove
 
@@ -59,7 +61,7 @@
 		snap_name=${snap%/*}
 		cat <<EOF >> chroot/var/lib/snapd/seed/seed.yaml
  - name: ${snap_name}
-   channel: stable
+   channel: $snap_channel
 EOF
 		case ${snap} in */classic) echo "   classic: true" >> chroot/var/lib/snapd/seed/seed.yaml;; esac
 		echo -n "   file: " >> chroot/var/lib/snapd/seed/seed.yaml