Merge remote-tracking branch 'rcj/feature/snap_cohort_key-xenial' into ubuntu/xenial

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.408.58) xenial; urgency=medium
+
+  * Use a snap cohort key for consistent parallel builds (LP: #1866159)
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Fri, 21 Feb 2020 21:32:37 -0600
+
 livecd-rootfs (2.408.57) xenial; urgency=medium
 
   * Preserve apt preferences created by any package we install (i.e.

live-build/functions

@@ -367,6 +367,7 @@ _snap_preseed() {
         set -x;
         cd /var/lib/snapd/seed;
         SNAPPY_STORE_NO_CDN=1 snap download \
+            --cohort="${COHORT_KEY:-}" \
             --channel=$CHANNEL \"$SNAP_NAME\"" || snap_download_failed=1
     if [ $snap_download_failed = 1 ] ; then
         echo "If the channel ($CHANNEL) includes '*/ubuntu-##.##' track per "