Merge lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix-for-yakkety into lp:~ubuntu-core-dev/livecd-rootfs/yakkety-proposed

[Balint Reczey]

[lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix-for-yakkety]

1456. By Balint Reczey on 2017-05-12

Update changelog

=== modified file 'debian/changelog'
--- debian/changelog	2017-03-17 18:47:25 +0000
+++ debian/changelog	2017-05-12 20:07:00 +0000
@@ -1,3 +1,20 @@
+livecd-rootfs (2.435.3) UNRELEASED; urgency=medium
+
+  [ Balint Reczey ]
+  * Source ubuntu-cpc functions from the right place
+  * Use all config hooks from the proper place, not from /build/
+  * Add basic but configurable autopkgtest (LP: #1690440)
+  * sync before calling kpartx to let writing to loop devices finish
+
+  [ Steve Langasek ]
+  * Mark autopkgtests isolation-machine since debootstrap won't work in a container.
+  * Resurrect Balint's fix from
+    lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest-fix to wrap kpartx
+    and trap spurious errors, since the problem is still being seen
+    intermittently on i386 despite us calling sync before kpartx. (LP: #1684090)
+
+ -- Balint Reczey <[e-mail]>  Thu, 11 May 2017 16:18:20 +0200
+
 livecd-rootfs (2.435.2) yakkety; urgency=medium
 
   [ Chris Glass ]

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2017-05-12 20:07:00 +0000
@@ -0,0 +1,3 @@
+Tests: default-bootstraps
+Depends: @, lsb-release
+Restrictions: needs-root isolation-machine

=== added file 'debian/tests/default-bootstraps'
--- debian/tests/default-bootstraps	1970-01-01 00:00:00 +0000
+++ debian/tests/default-bootstraps	2017-05-12 20:07:00 +0000
@@ -0,0 +1,97 @@
+#!/bin/sh
+# autopkgtest check: Build default rootfs for all supported project:subproject pairs
+# (C) 2017 Canonical Ltd.
+# Author: Balint Reczey <[e-mail]>
+
+set -e
+
+if [ -z "$SUITE"]; then
+    SUITE=$(lsb_release -c -s)
+fi
+
+# Known project:subproject:template combinations.
+# Listed subprojects can be combined with other projects as well,
+# but this list gives reasonable coverage.
+ALL_TRIPLETS="
+ base::
+ edubuntu::
+ edubuntu-dvd::
+ kubuntu::
+ kubuntu-active::
+ kubuntu-dvd::
+ kubuntu-plasma5::
+ lubuntu::
+ lubuntu-next::
+ mythbuntu::
+ ubuntu::
+ ubuntu-base::
+ ubuntu-budgie::
+ ubuntu-budgie-desktop::
+ ubuntu-budgie-live::
+ ubuntu-core:system-image:ubuntu-core
+ ubuntu-cpc::ubuntu-cpc
+ ubuntu-desktop-next:system-image:ubuntu-desktop-next
+ ubuntu-desktop-next::ubuntu-desktop-next
+ ubuntu-dvd::
+ ubuntu-gnome::
+ ubuntukylin::
+ ubuntu-mate::
+ ubuntu-mate-core::
+ ubuntu-mate-desktop::
+ ubuntu-mate-live::
+ ubuntu-netbook::
+ ubuntu-server::
+ ubuntu-server:ubuntu-rtm:
+ ubuntu-server:ubuntu-rtm/foo:
+ ubuntu-server:wubi:
+ ubuntu-touch-custom::ubuntu-touch-custom
+ ubuntu-touch::ubuntu-touch
+ xubuntu::"
+
+if [ -z "$SELECTED_TRIPLETS" ]; then
+    SELECTED_TRIPLETS="
+ ubuntu-base::
+ ubuntu-cpc::ubuntu-cpc
+"
+fi
+
+live_build_rootfs() {
+    PROJECT=${1%%:*}
+    local SUBPROJECT_TMP=${1%:*}
+    SUBPROJECT=${SUBPROJECT_TMP#*:}
+    TEMPLATE=${1##*:}
+    ARCH=$(dpkg --print-architecture)
+    echo "Building rootfs for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
+    cp -a /usr/share/livecd-rootfs/live-build/auto .
+    if [ -n "$TEMPLATE" ]; then
+        cp -a /usr/share/livecd-rootfs/live-build/$TEMPLATE .
+    fi
+    (env PROJECT=$PROJECT \
+         SUBPROJECT=$SUBPROJECT \
+         SUITE=$SUITE \
+         ARCH=$ARCH \
+         lb config
+    )
+    mkdir chroot
+    # this part needs root rights, but right now the whole script ran as root by autopkgtest
+    (env PROJECT=$PROJECT \
+         SUBPROJECT=$SUBPROJECT \
+         ARCH=$ARCH \
+         lb build
+    )
+    echo "Build results for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
+    du -sh *
+    echo ""
+}
+
+WORKDIR=$(mktemp -d)
+trap "RET=\$?; rm -rf $WORKDIR; exit \$RET" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+
+for i in $SELECTED_TRIPLETS; do
+    mkdir $i
+    (cd $i && live_build_rootfs $i)
+    # clean up after build to avoid filling the disk, needs root rights
+    rm -rf $i
+done
+

=== modified file 'live-build/ubuntu-cpc/functions'
--- live-build/ubuntu-cpc/functions	2017-03-17 18:46:27 +0000
+++ live-build/ubuntu-cpc/functions	2017-05-12 20:07:00 +0000
@@ -11,9 +11,22 @@
 apt-get -qqy install dosfstools gdisk
 
 clean_loops() {
+    local kpartx_ret
+    local kpartx_stdout
 
     if [ -n "${backing_img}" ]; then
-        kpartx -v -d "${backing_img}"
+        # sync before removing loop to avoid "Device or resource busy" errors
+        sync
+        kpartx_ret=""
+        kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
+        echo "$kpartx_stdout"
+        if [ -n "$kpartx_ret" ]; then
+            if echo "$kpartx_stdout" | grep -q "loop deleted: "; then
+                echo "Suppressing kpartx returning error (#860894)"
+            else
+                exit $kpartx_ret
+            fi
+        fi
         unset backing_img
     fi
 

=== modified file 'live-build/ubuntu-cpc/hooks/032-disk-image.binary'
--- live-build/ubuntu-cpc/hooks/032-disk-image.binary	2016-06-09 09:47:25 +0000
+++ live-build/ubuntu-cpc/hooks/032-disk-image.binary	2017-05-12 20:07:00 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-. /build/config/functions
+. config/functions
 
 BOOTPART_START=
 BOOTPART_END=
@@ -92,7 +92,7 @@
 		# not the best place for this, but neither flash-kernel nor
 		# u-boot have provisions for installing u-boot via maintainer
 		# script
-		/build/config/hooks/raspi2/mkknlimg --dtok \
+		config/hooks/raspi2/mkknlimg --dtok \
 			mountpoint/usr/lib/u-boot/rpi_2/u-boot.bin \
 			mountpoint/boot/firmware/uboot.bin
 		;;

=== modified file 'live-build/ubuntu-cpc/hooks/032-root-squashfs.binary'
--- live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2016-06-09 09:47:25 +0000
+++ live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2017-05-12 20:07:00 +0000
@@ -8,7 +8,7 @@
 	exit 0
 fi
 
-. /build/config/functions
+. config/functions
 
 mkdir binary/boot/squashfs.dir
 cp -a chroot/* binary/boot/squashfs.dir

=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2017-03-17 18:46:27 +0000
+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2017-05-12 20:07:00 +0000
@@ -9,7 +9,7 @@
         ;;
 esac
 
-. /build/config/functions
+. config/functions
 
 apt-get -qqy install dosfstools gdisk
 

=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2017-03-17 18:46:27 +0000
+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2017-05-12 20:07:00 +0000
@@ -7,7 +7,7 @@
         ;;
 esac
 
-. /build/config/functions
+. config/functions
 
 create_partitions() {
     disk_image="$1"

=== modified file 'live-build/ubuntu-cpc/hooks/040-qcow2-image.binary'
--- live-build/ubuntu-cpc/hooks/040-qcow2-image.binary	2016-06-09 09:47:25 +0000
+++ live-build/ubuntu-cpc/hooks/040-qcow2-image.binary	2017-05-12 20:07:00 +0000
@@ -12,7 +12,7 @@
 
 apt-get install -qqy qemu-utils
 
-. /build/config/functions
+. config/functions
 
 if [ -f binary/boot/disk-uefi.ext4 ]; then
     convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.img

=== modified file 'live-build/ubuntu-cpc/hooks/040-vmdk-image.binary'
--- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary	2016-06-09 09:47:25 +0000
+++ live-build/ubuntu-cpc/hooks/040-vmdk-image.binary	2017-05-12 20:07:00 +0000
@@ -9,7 +9,7 @@
                      exit 0;;
 esac
 
-. /build/config/functions
+. config/functions
 
 if [ -e binary/boot/disk-uefi.ext4 ]; then
     create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk

=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-03-17 18:45:42 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-05-12 20:07:00 +0000
@@ -35,7 +35,7 @@
            exit 0;;
 esac
 
-. /build/config/functions
+. config/functions
 
 # Virtualbox is needed for making a small VMDK
 apt-get -qqy install genisoimage qemu-utils

=== modified file 'live-build/ubuntu-cpc/hooks/999-extras.binary'
--- live-build/ubuntu-cpc/hooks/999-extras.binary	2016-01-28 10:07:33 +0000
+++ live-build/ubuntu-cpc/hooks/999-extras.binary	2017-05-12 20:07:00 +0000
@@ -9,7 +9,7 @@
 fi
 
 # Export the common functions to the extras
-. /build/config/functions
+. config/functions
 
 # Cleaner execution
 /bin/run-parts --regex ".*\.binary" "${extra_d}"