Merge autopkgtest-cloud:series-bootstrapping into autopkgtest-cloud:master

[Steve Langasek]

It seems generally useful to be able to bootstrap our autopkgtest nova images in parallel with the cloud image creation. This would let us support it explicitly.

[Iain Lane (laney)]

Thanks!

review: Approve

diff --git a/tools/build-adt-image-all-clouds b/tools/build-adt-image-all-clouds
index 103759b..fa26b2a 100755
--- a/tools/build-adt-image-all-clouds
+++ b/tools/build-adt-image-all-clouds
@@ -5,6 +5,12 @@ set -eu
 
 SETUP_SCRIPT="$1"
 RELEASE=${RELEASE:-$(distro-info --devel)}
+case $2 in
+	--bootstrap)
+		BASE_RELEASE=${BASE_RELEASE:-$(distro-info --stable)}
+		;;
+esac
+
 ARCHES="ppc64el i386 amd64 arm64"
 export MIRROR=http://ftpmaster.internal/ubuntu
 
@@ -21,6 +27,12 @@ do_one_cloud() {
         IMG=$(echo "$IMGS" | grep "${RELEASE}-daily-${arch}" | tail -n1 | awk '{print $2}')
         # Fall back to previous adt image and upgrade that
         [ -n "$IMG" ] || IMG=$(echo "$IMGS" | grep "${RELEASE}-adt-${arch}" | tail -n1 | awk '{print $2}')
+        # If we have neither, and --bootstrap is passed, fall back to the
+        # latest stable release
+        if [ -n "$BASE_RELEASE" ]; then
+            [ -n "$IMG" ] || IMG=$(echo "$IMGS" | grep "${BASE_RELEASE}-daily-${arch}" | tail -n1 | awk '{print $2}')
+            [ -n "$IMG" ] || IMG=$(echo "$IMGS" | grep "${BASE_RELEASE}-adt-${arch}" | tail -n1 | awk '{print $2}')
+        fi
         [ -n  "$IMG" ] || continue
         echo "$(date -R) $arch: using image $IMG"
         $(dirname $0)/create-nova-image-new-release $RELEASE $IMG testbed-`hostname` "$SETUP_SCRIPT"