diff options
Diffstat (limited to 'testing/testing.conf')
| -rw-r--r-- | testing/testing.conf | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/testing/testing.conf b/testing/testing.conf index 7fb82032e..0d8eff3d2 100644 --- 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 |