Create all images in $BUILDDIR/images

This commit is contained in:
Reto Buerki
2013-01-17 16:54:58 +01:00
committed by Tobias Brunner
parent 482d3ec9ff
commit 48ea1d8b0b
5 changed files with 12 additions and 14 deletions
+6 -8
View File
@@ -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