Create all images in $BUILDDIR/images

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 85b3d31..81460d9 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -21,8 +21,8 @@ CACHEDIR=$BUILDDIR/cache
 APTCACHE=$LOOPDIR/var/cache/apt/archives
 
 mkdir -p $LOOPDIR
-mkdir -p $BUILDDIR
 mkdir -p $CACHEDIR
+mkdir -p $IMGDIR
 rm -f $BASEIMG
 
 echo "`date`, building $BASEIMG" >>$LOGFILE

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index cf64bd8..d07981a 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -28,9 +28,8 @@ check_commands partprobe qemu-img qemu-nbd
 
 load_qemu_nbd
 
-mkdir -p $BUILDDIR
+mkdir -p $IMGDIR
 mkdir -p $LOOPDIR
-mkdir -p $GUESTIMGDIR
 
 # just to be sure
 do_on_exit qemu-nbd -d $NBDEV
@@ -39,8 +38,8 @@ do_on_exit umount $LOOPDIR
 for host in $STRONGSWANHOSTS
 do
        log_action "Creating guest image for $host"
-       execute "qemu-img create -b $ROOTIMG -f $IMGEXT $GUESTIMGDIR/$host.$IMGEXT" 0
-       execute "qemu-nbd -c $NBDEV $GUESTIMGDIR/$host.$IMGEXT" 0
+       execute "qemu-img create -b $ROOTIMG -f $IMGEXT $IMGDIR/$host.$IMGEXT" 0
+       execute "qemu-nbd -c $NBDEV $IMGDIR/$host.$IMGEXT" 0
        partprobe $NBDEV
        execute "mount $NBDPARTITION $LOOPDIR" 0
        execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0

diff --git a/testing/scripts/build-rootimage b/testing/scripts/build-rootimage
index 8d3f32b..b575ebb 100755 (executable)
--- a/testing/scripts/build-rootimage
+++ b/testing/scripts/build-rootimage
@@ -27,6 +27,7 @@ load_qemu_nbd
 
 mkdir -p $LOOPDIR
 mkdir -p $ROOTIMGCOMPILEDIR
+mkdir -p $IMGDIR
 
 log_action "Creating root image $ROOTIMG"
 execute "qemu-img create -b $BASEIMG -f $IMGEXT $ROOTIMG"

diff --git a/testing/start-testing b/testing/start-testing
index 997b26c..dce089a 100755 (executable)
--- a/testing/start-testing
+++ b/testing/start-testing
@@ -24,7 +24,7 @@ done
 
 for host in $STRONGSWANHOSTS
 do
-       ln -fs $GUESTIMGDIR/$host.$IMGEXT $VIRTIMGSTORE/$host.$IMGEXT
+       ln -fs $IMGDIR/$host.$IMGEXT $VIRTIMGSTORE/$host.$IMGEXT
        log_action "Guest $host"
        execute "virsh create $CONFDIR/$host.xml"
 done

diff --git a/testing/testing.conf b/testing/testing.conf
index 7fb8203..0d8eff3 100644 (file)
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -36,26 +36,24 @@ LOGFILE=$BUILDDIR/testing.log
 # Directory used for loop-mounts
 LOOPDIR=$BUILDDIR/loop
 
-# Image extension
+# Common image settings
 IMGEXT=qcow2
+IMGDIR=$BUILDDIR/images
 
 # Base image settings
 # The base image is a pristine OS installation created using debootstrap.
 BASEIMGSIZE=1024
 BASEIMGSUITE=wheezy
 BASEIMGARCH=amd64
-BASEIMG=$BUILDDIR/debian-$BASEIMGSUITE-$BASEIMGARCH.$IMGEXT
+BASEIMG=$IMGDIR/debian-$BASEIMGSUITE-$BASEIMGARCH.$IMGEXT
 BASEIMGMIRROR=http://cdn.debian.net/debian
 
 # Root image settings
-# The root image is the origin of all guest images. It contains additional
-# test-specific software and patches.
-ROOTIMG=$BUILDDIR/root.$IMGEXT
+# The root image is the origin of all guest images. It is a clone of the base
+# image and contains additional test-specific software and patches.
+ROOTIMG=$IMGDIR/root.$IMGEXT
 ROOTIMGCOMPILEDIR=$BUILDDIR/compile
 
-# Guest images settings
-GUESTIMGDIR=$BUILDDIR/guest-images
-
 # libvirt config
 NBDEV=/dev/nbd0
 NBDPARTITION=${NBDEV}p1