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

[Scott Moser]

Fix --proposed in kpack-from-image for arch other than i386 and amd64.

kpack-from-image always use archive.ubuntu.com for the ubuntu mirror
instead of ports.ubuntu.com for arch other than intel.

The change here does 3 things:
a.) change variable names in maas-cloudimg2ephemeral to be consistent
    with those used in kpack-from-image
a.) read UBUNTU_MIRROR and UBUNTU_MIRROR_PORTS from environment in both
    kpack-from-image and maas-cloudimg2ephemeral.
c.) pass UBUNTU_MIRROR and UBUNTU_MIRROR_PORTS through sudo call
    in kpack-from-image.

[Scott Moser (smoser)]

somewhat related to
 https://bugs.launchpad.net/maas-images/+bug/1777928

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[Andres Rodriguez (andreserl)]

@Scott, if you think this is related to the above, does it make sense to close the bug ? Since I have a feeling that this will fix it ?

[Scott Moser (smoser)]

@Andreas, I marked the bug as invalid. It reported the stack trace, which occurs only on xenial. We're not going to fix that. there was a bug with --proposed and non-intel, that is fixed here.

=== modified file 'bin/kpack-from-image'
--- bin/kpack-from-image	2018-04-06 04:19:17 +0000
+++ bin/kpack-from-image	2018-07-09 18:38:41 +0000
@@ -3,6 +3,9 @@
 VERBOSITY=0
 TEMP_D=""
 COPY_TYPES="auto overlay qcow2 cp none"
+UBUNTU_MIRROR=${UBUNTU_MIRROR:-"http://archive.ubuntu.com/ubuntu/"}
+UBUNTU_MIRROR_PORTS=${UBUNTU_MIRROR_PORTS:-"http://ports.ubuntu.com/ubuntu-ports/"}
+PROPOSED_ARCHIVE_FILE="/etc/apt/sources.list.d/proposed.list"
 command -v unshare-pidns >/dev/null 2>&1 || PATH="${0%/*}:$PATH"
 
 error() { echo "$@" 1>&2; }
@@ -281,9 +284,9 @@
     # installs all packages (arguments), writes kernel
     # and initramfs and 'verflav' to /tmp/ 
     VERBOSITY=${CHROOTED_VERBOSITY:-${VERBOSITY}}
-    local pkgs="" kpkg="" copymods zzgrub emd="" out pkg rel
+    local pkgs="" kpkg="" copymods zzgrub emd="" out pkg rel arch
     local skip_update=${KPACK_SKIP_APT_UPDATE:-false}
-    local proposed=${PROPOSED:-false} proposed_lfile=""
+    local proposed=${PROPOSED:-false} proposed_lfile="${PROPOSED_ARCHIVE_FILE}"
     local verflav initrd kernel
     export LANG=C
     kpkg="$1"
@@ -295,12 +298,18 @@
     local stamp="$outd/stamp"
     touch "$stamp"
 
-    # add proposed if necessary
     rel=$(lsb_release -sc) ||
         { error "failed to read release"; return 1; }
+    arch=$(dpkg --print-architecture) ||
+        { error "failed to get architecture from dpkg"; return 1; }
+
+    # add proposed if necessary
     if $proposed; then
-        local mirror=${UBUNTU_MIRROR:-http://archive.ubuntu.com/ubuntu/}
-        proposed_lfile="/etc/apt/sources.list.d/proposed.list"
+        local mirror=""
+        case "$arch" in
+            i?86|amd64) mirror="${UBUNTU_MIRROR}";;
+            *) mirror="${UBUNTU_MIRROR_PORTS}";;
+        esac
         debug 1 "adding proposed ($mirror) to $proposed_lfile"
         echo "deb $mirror ${rel}-proposed main universe multiverse" \
             > "$proposed_lfile"
@@ -385,7 +394,7 @@
     unreplace_newaliases / ||
         { error "failed to un-replace newaliases"; return 1; }
 
-    [ -z "$proposed_lfile" ] || rm -f "$proposed_lfile"
+    $proposed && rm -f "$proposed_lfile"
 
     # here we look at all kernel files in /boot and get the package that
     # owns it.  if the package is the kernel that was supplied, then we
@@ -536,6 +545,8 @@
     sudo \
         "KPACK_SKIP_APT_UPDATE=${KPACK_SKIP_APT_UPDATE:-false}" \
         "http_proxy=$http_proxy" PACKAGES="$kpkg" \
+        UBUNTU_MIRROR=${UBUNTU_MIRROR} \
+        UBUNTU_MIRROR_PORTS=${UBUNTU_MIRROR_PORTS} \
         "$mic" --sys --proc $overlay_flags \
             --system-resolvconf "$myimg" -- "$0" "kernel_from_mp" $vflags \
             _MOUNTPOINT_ "--chown-to=$chown_to" \

=== modified file 'bin/maas-cloudimg2ephemeral'
--- bin/maas-cloudimg2ephemeral	2018-02-12 22:10:35 +0000
+++ bin/maas-cloudimg2ephemeral	2018-07-09 18:38:41 +0000
@@ -36,8 +36,8 @@
 IMAGES_PPA_FILE="/etc/apt/sources.list.d/maas-ephemeral-images.list"
 IMAGES_PPA_URL="http://ppa.launchpad.net/maas-maintainers/maas-ephemeral-images/ubuntu"
 
-ARCHIVE_MIRROR="http://archive.ubuntu.com/ubuntu/"
-ARCHIVE_MIRROR_PORTS="http://ports.ubuntu.com/ubuntu-ports/"
+UBUNTU_MIRROR=${UBUNTU_MIRROR:-"http://archive.ubuntu.com/ubuntu/"}
+UBUNTU_MIRROR_PORTS=${UBUNTU_MIRROR_PORTS:-"http://ports.ubuntu.com/ubuntu-ports/"}
 PROPOSED_ARCHIVE_FILE="/etc/apt/sources.list.d/proposed.list"
 
 VERBOSITY=0
@@ -299,8 +299,8 @@
     if $proposed; then
         local mirror=""
         case "$arch" in
-            i?86|amd64) mirror="$ARCHIVE_MIRROR";;
-            *) mirror="$ARCHIVE_MIRROR_PORTS";;
+            i?86|amd64) mirror="${UBUNTU_MIRROR}";;
+            *) mirror="${UBUNTU_MIRROR_PORTS}";;
         esac
         log_change true "$change [$arch $mirror]"
         debug 1 "enabling proposed for $release [$arch $mirror]"