diff options
-rwxr-xr-x | deploy-all | 2 | ||||
-rwxr-xr-x | vm-all | 2 | ||||
-rwxr-xr-x | vm-create | 6 | ||||
-rw-r--r-- | vm-data/jenkins.conf | 2 |
4 files changed, 7 insertions, 5 deletions
@@ -8,7 +8,7 @@ install_vm() then echo "virt-installing $1" virt-install --connect qemu:///system -n "$1" -r "$2" \ - --disk path="/srv/vm-images/$1.img",bus=virtio \ + --disk path="/dev/havelock/$1",bus=virtio \ --graphics vnc --os-type linux --noreboot --import fi } @@ -11,7 +11,7 @@ jenkins-sid-i386 " TRIES=10 -DELAY=10 +DELAY=1 ssh_is_open() { @@ -21,6 +21,7 @@ set -eux PATH="$PATH:/home/liw/vmdebootstrap/vmdebootstrap" +VMTMP="/mnt/vmtmp" # Create the SSH host and user keys. for key in jenkins.host-key jenkins.user-key worker.host-key worker.user-key @@ -39,10 +40,11 @@ for flavor in \ sid-amd64 sid-i386 do conf="vm-data/$flavor.conf" - img=$(awk '$1 ~ /^image[:=]?/ { print $NF }' "$conf") + img="$VMTMP"/$(awk '$1 ~ /^image[:=]?/ { print $NF }' "$conf") if [ ! -e "$img" ] then - vmdebootstrap --config vm-data/common.conf --config "$conf" "$@" + vmdebootstrap --config vm-data/common.conf --config "$conf" \ + --image "$img" "$@" fi done diff --git a/vm-data/jenkins.conf b/vm-data/jenkins.conf index 8233b04..16bc159 100644 --- a/vm-data/jenkins.conf +++ b/vm-data/jenkins.conf @@ -4,5 +4,5 @@ hostname = jenkins arch = amd64 image = jenkins.img customize = vm-data/jenkins.customize -package = acpid, acpi-support-base, bzr, git, ssh, vim, less, rsync, apache2, reprepro, sudo, graphviz, python-coverage +package = acpid, acpi-support-base, bzr, git, ssh, vim, less, rsync, apache2, reprepro, sudo, graphviz, python-coverage, default-jre-headless |