Merge lp:~smoser/maas-images/manifests into lp:maas-images

[Scott Moser]

Add manifest files for root-image.gz

This adds manifest files similar to cloud image manifests.
These are nice to have, and also will help in testing things later
as we have some changes coming where we'll want to easily compare image contents.

=== modified file 'bin/fake-maas-cloudimg2eph2'
--- bin/fake-maas-cloudimg2eph2	2015-02-13 21:20:35 +0000
+++ bin/fake-maas-cloudimg2eph2	2015-11-06 21:12:31 +0000
@@ -4,7 +4,7 @@
 error() { echo "$@" 1>&2; }
 
 short_opts="a:k:p:v"
-long_opts="arch:,kernel:,krd-pack:,verbose"
+long_opts="arch:,kernel:,krd-pack:,manifest:,verbose"
 getopt_out=$(getopt --name "${0##*/}" \
     --options "${short_opts}" --long "${long_opts}" -- "$@") &&
     eval set -- "${getopt_out}" ||
@@ -13,18 +13,20 @@
 gzip=true
 arch=""
 kernel=""
+manif=""
 kpacks=( )
 while [ $# -ne 0 ]; do
-	cur=$1
-	next=$2
-	case "$cur" in
-		-a|--arch) arch="$next"; shift;;
-		-k|--kernel) kernel=$next; shift;;
-		-p|--krd-pack) kpacks[${#kpacks[@]}]=$next; shift;;
-		   --no-gzip) gzip=false;;
-		--) shift; break;;
-	esac
-	shift;
+    cur=$1
+    next=$2
+    case "$cur" in
+        -a|--arch) arch="$next"; shift;;
+        -k|--kernel) kernel=$next; shift;;
+        -p|--krd-pack) kpacks[${#kpacks[@]}]=$next; shift;;
+           --manifest) manif="$next"; shift;;
+           --no-gzip) gzip=false;;
+        --) shift; break;;
+    esac
+    shift;
 done
 
 src=$1
@@ -37,6 +39,12 @@
 
 error "src=$src arch=$arch kernel=$kernel output=$root_gz"
 dd if=/dev/zero bs=1024 count=1024 2>/dev/null | $gzip_prog > "$root_gz"
+if [ -n "$manif" ]; then
+   npkg=10
+   for((i=0;i<$npkg;i++)); do
+      printf "bogus-package-%02d\t0.$((($npkg-$i)%$npkg))\n" "$i"
+   done > "$manif"
+fi
 
 OIFS="$IFS"
 for kpack in "${kpacks[@]}"; do

=== modified file 'bin/maas-cloudimg2eph2'
--- bin/maas-cloudimg2eph2	2015-10-26 19:07:07 +0000
+++ bin/maas-cloudimg2eph2	2015-11-06 21:12:31 +0000
@@ -20,6 +20,7 @@
     -k | --kernel K    keep/install the kernel package 'k' inside image
     -p | --krd-pack P  create a kernel / ramdisk pack
                        P is ',' delimited: kernel-name,kernel,ramdisk[,flags]
+         --manifest M  write the dpkg manifest to M
     -v | --verbose     increase verbosity
 
    Example:
@@ -309,7 +310,7 @@
 
 main() {
     local short_opts="a:hk:p:v"
-    local long_opts="arch:,help,kernel:,krd-pack:,no-gzip,verbose"
+    local long_opts="arch:,help,kernel:,krd-pack:,manifest:,no-gzip,verbose"
     local getopt_out=""
     getopt_out=$(getopt --name "${0##*/}" \
         --options "${short_opts}" --long "${long_opts}" -- "$@") &&
@@ -319,6 +320,7 @@
     local cur="" next="" output="" gzip=true kpkg=""
     local kpacks="" src_in="" src="" arch="" vflags=""
     local working_space="1024M" zero_img="true" fs_img_size="1400M"
+    local manifest_out=""
     kpacks=( )
 
     while [ $# -ne 0 ]; do
@@ -327,6 +329,7 @@
             -h|--help) Usage ; exit 0;;
             -a|--arch) arch="$next"; shift;;
             -k|--kernel) kpkg=$next; shift;;
+               --manifest) manifest_out="$next";;
             -p|--krd-pack) kpacks[${#kpacks[@]}]="$next"; shift;;
                --no-gzip) gzip=false;;
             -v|--verbose) VERBOSITY=$((${VERBOSITY}+1)); vflags="${vflags}v";;
@@ -404,6 +407,8 @@
         ${arch:+"--arch=$arch"} "$imgfile" \
         "$kpkg" "$pkout" "$piout" "$manif" ||
         { error "failed to turn $imgfile to ephemeral"; return 1; }
+    [ -z "$manifest_out" ] || cp "$manif" "$manifest_out" ||
+        { error "failed copying manifest to $manifest_out"; return 1; }
 
     local i="" oifs="$IFS"
     ddebug 1 "starting kpacks: ${kpacks[*]}"

=== modified file 'meph2/commands/cloudimg_sync.py'
--- meph2/commands/cloudimg_sync.py	2015-09-11 14:15:58 +0000
+++ meph2/commands/cloudimg_sync.py	2015-11-06 21:12:31 +0000
@@ -46,6 +46,7 @@
 DI_COMMON = PATH_COMMON + "di/%(di_version)s/%(krel)s/%(flavor)s"
 PATH_FORMATS = {
     'root-image.gz': PATH_COMMON + "%(version_name)s/root-image.gz",
+    'manifest': PATH_COMMON + "%(version_name)s/root-image.manifest",
     'boot-dtb': BOOT_COMMON + "/boot-dtb%(suffix)s",
     'boot-kernel': BOOT_COMMON + "/boot-kernel%(suffix)s",
     'boot-initrd': BOOT_COMMON + "/boot-initrd%(suffix)s",
@@ -259,13 +260,15 @@
                 'version_name': vername, 'version': version}
 
         rootimg_path = PATH_FORMATS['root-image.gz'] % subs
+        manifest_path = PATH_FORMATS['manifest'] % subs
 
         mci2e = os.environ.get('MAAS_CLOUDIMG2EPH2', "maas-cloudimg2eph2")
         gencmd = ([mci2e] + self.vflags +
                   ["--kernel=%s" % builtin_kernel, "--arch=%s" % arch,
+                   "--manifest=%s" % os.path.join(self.out_d, manifest_path),
                    contentsource.url, os.path.join(self.out_d, rootimg_path)])
         krd_packs = []
-        newpaths = set((rootimg_path,))
+        newpaths = set((rootimg_path, manifest_path,))
 
         kdata_defaults = {'suffix': "", 'di-format': "default", 'dtb': ""}
 
@@ -301,7 +304,7 @@
             di_keys = ['di-kernel', 'di-initrd']
             boot_keys = ['boot-kernel', 'boot-initrd']
             ikeys = ['boot-kernel', 'boot-initrd', 'di-kernel',
-                     'di-initrd', 'root-image.gz']
+                     'di-initrd', 'root-image.gz', 'manifest']
 
             if kdata.get('dtb'):
                 ikeys.append('di-dtb')