livecd-rootfs

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

  1. ubuntu-channels-for-snaps
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Merged at revision: 1634
Proposed branch: lp:~vorlon/livecd-rootfs/ubuntu-channels-for-snaps
Merge into: lp:livecd-rootfs
Diff against target: 45 lines (+11/-2)
2 files modified
debian/changelog (+7/-0)
live-build/auto/build (+4/-2)
To merge this branch: bzr merge lp:~vorlon/livecd-rootfs/ubuntu-channels-for-snaps
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Needs Information
Iain Lane Needs Information
Review via email: mp+337897@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

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.

Revision history for this message
Iain Lane (laney) :
review: Needs Information
Revision history for this message
Iain Lane (laney) wrote :

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

Ken says it has been. :-)

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

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
Revision history for this message
Steve Langasek (vorlon) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-02-14 20:54:21 +0000
3+++ debian/changelog 2018-02-16 22:09:43 +0000
4@@ -1,3 +1,10 @@
5+livecd-rootfs (2.504) UNRELEASED; urgency=medium
6+
7+ * Use Ubuntu-specific branches when seeding snaps, as required in
8+ <https://wiki.ubuntu.com/UbuntuSeededSnaps>.
9+
10+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 16 Feb 2018 14:02:49 -0800
11+
12 livecd-rootfs (2.503) bionic; urgency=medium
13
14 * Install linux-signed-generic in the live-server image. (LP: #1749065)
15
16=== modified file 'live-build/auto/build'
17--- live-build/auto/build 2018-01-30 10:16:36 +0000
18+++ live-build/auto/build 2018-02-16 22:09:43 +0000
19@@ -35,6 +35,8 @@
20
21 preinstall_snaps() {
22 lb chroot_resolv install
23+ snap_channel="stable/ubuntu-$(distro-info --series="$LB_DISTRIBUTION" \
24+ -r | awk '{ print $1 }')"
25 chroot chroot sh -c '
26 set -x;
27 cd /var/lib/snapd/seed;
28@@ -43,7 +45,7 @@
29 chroot chroot sh -c "
30 set -x;
31 cd /var/lib/snapd/seed;
32- SNAPPY_STORE_NO_CDN=1 snap download \"${snap%/*}\""
33+ SNAPPY_STORE_NO_CDN=1 snap download --channel=$snap_channel \"${snap%/*}\""
34 done
35 lb chroot_resolv remove
36
37@@ -59,7 +61,7 @@
38 snap_name=${snap%/*}
39 cat <<EOF >> chroot/var/lib/snapd/seed/seed.yaml
40 - name: ${snap_name}
41- channel: stable
42+ channel: $snap_channel
43 EOF
44 case ${snap} in */classic) echo " classic: true" >> chroot/var/lib/snapd/seed/seed.yaml;; esac
45 echo -n " file: " >> chroot/var/lib/snapd/seed/seed.yaml

Subscribers

People subscribed via source and target branches