Merge lp:~smoser/maas-images/trunk.proposed-kpack into lp:maas-images

[Scott Moser]

Cleanups around use of --proposed.

The --proposed flag was not getting all the way through to
kpack-from-image. This modification just gets it set all the way through.
It isn't strictly needed, because the image that it runs in will have
proposed enabled already, but passing it through makes it more obvious.

In kpack-from-image, use the same .list file name that is used in
maas-cloudimg2eph and also enable universe and multiverse as are done there.

Also some cleanups:
 - dist_upgrade was set to 'false' by default, but then enabled to either
   'true' or '1'. Just be consistent and set to true to avoid confusion.
 - fix a debug message that reported about ppa when it should have reported
   about proposed.

[lp:~smoser/maas-images/trunk.proposed-kpack]

390. By Scott Moser on 2018-01-06

do not pass --proposed to handle_kpack, say why not needed

391. By Scott Moser on 2018-01-06

kpack-from-image: for proposed, use same file and archive and components

392. By Scott Moser on 2018-01-06

and now jsut pass it anyway

[Lee Trager (ltrager)]

LGTM!

review: Approve

=== modified file 'bin/kpack-from-image'
--- bin/kpack-from-image	2017-12-13 20:31:28 +0000
+++ bin/kpack-from-image	2018-01-06 02:15:06 +0000
@@ -299,9 +299,10 @@
         { error "failed to read release"; return 1; }
     if $proposed; then
         local mirror=${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}
-        proposed_lfile="/etc/apt/sources.list.d/proposed-$rel.list"
+        proposed_lfile="/etc/apt/sources.list.d/proposed.list"
         debug 1 "adding proposed ($mirror) to $proposed_lfile"
-        echo "deb $mirror ${rel}-proposed main" > "$proposed_lfile"
+        echo "deb $mirror ${rel}-proposed main universe multiverse" \
+            > "$proposed_lfile"
         $skip_update && 
             { skip_update=false; debug 1 "enabling update due to proposed"; }
     fi

=== modified file 'bin/maas-cloudimg2eph2'
--- bin/maas-cloudimg2eph2	2017-10-06 20:52:17 +0000
+++ bin/maas-cloudimg2eph2	2018-01-06 02:15:06 +0000
@@ -608,7 +608,9 @@
     ddebug 1 "starting kpacks: ${kpacks[*]}"
     for i in "${kpacks[@]}"; do
         IFS=","; set -- $i; IFS="$oifs"
-        handle_kpack "$imgfile" "$@" ||
+        # handle_kpack doesn't actually need $proposed_flag, because $imgfile
+        # will have it already enabled, but passing it is more obvious.
+        handle_kpack $proposed_flag "$imgfile" "$@" ||
             { error "handle_kpack '$imgfile' $* failed"; return 1; }
     done
     ddebug 1 "kpacks done"

=== modified file 'bin/maas-cloudimg2ephemeral'
--- bin/maas-cloudimg2ephemeral	2017-05-05 15:19:06 +0000
+++ bin/maas-cloudimg2ephemeral	2018-01-06 02:15:06 +0000
@@ -265,7 +265,7 @@
         printf "%s\n" "$IMAGES_PPA_APT_KEY" | apt-key add - ||
             { error "apt-key add failed!"; return 1; }
         debug 1 "addition of PPA turns dist-upgrade on"
-        dist_upgrade=1
+        dist_upgrade=true
     else
         log_change false "$change"
         debug 1 "not adding images ppa to release=$release"
@@ -283,10 +283,10 @@
         echo "deb $mirror ${release}-proposed main universe multiverse" > "$PROPOSED_ARCHIVE_FILE" ||
             { error "failed writing to $PROPOSED_ARCHIVE_FILE"; return 1; }
         debug 1 "addition of proposed turns dist-upgrade on"
-        dist_upgrade=1
+        dist_upgrade=true
     else
         log_change false "$change"
-        debug 1 "not adding images ppa to release=$release"
+        debug 1 "not enabling proposed for $release (proposed=$proposed)."
     fi
 
     change="ensure mellanox mlx4_en gets loaded (LP: #1115710)"