Implement image device wipe for some VM's

build

@@ -699,7 +699,7 @@ run_rsync() {
 
 wipe_build_environement() {
     if test -n "$VM_TYPE"; then
-	vm_cleanup
+	vm_img_wipe
     else
 	echo "Wiping build root: '$BUILD_ROOT'"
 

build-vm

@@ -336,6 +336,17 @@ vm_img_create() {
     fi
 }
 
+vm_img_wipe() {
+    vm_wipe_$VM_TYPE "$@"
+
+    if test -n "$VM_IMAGE" -a ! -b "$VM_IMAGE" ; then
+       rm -f "$VM_IMAGE"
+    fi
+    if test -n "$VM_SWAP" -a ! -b "$VM_SWAP" ; then
+       rm -f "$VM_SWAP"
+    fi
+}
+
 vm_img_mkfs() {
     local fs="$1"
     local img="$2"

build-vm-docker

@@ -74,3 +74,7 @@ vm_cleanup_docker() {
     :
 }
 
+vm_wipe_docker() {
+    local name="obsbuild.${BUILD_ROOT##*/}"
+    docker rm "$name" >/dev/null 2>&1 || true
+}

build-vm-ec2

@@ -54,6 +54,11 @@ cloud_volume_detach_ec2() {
     return 0
 }
 
+vm_wipe_ec2() {
+    # not yet implemented
+    :
+}
+
 vm_verify_options_ec2() {
     # verify settings
     if test -z "$AWS_ACCESS_KEY" -o -z "$AWS_ACCESS_KEY" ; then

build-vm-emulator

@@ -88,4 +88,7 @@ vm_detach_swap_emulator() {
 vm_cleanup_emulator() {
     :
 }
+vm_wipe_emulator() {
+    :
+}
 

build-vm-kvm

@@ -314,3 +314,6 @@ vm_cleanup_kvm() {
     :
 }
 
+vm_wipe_kvm() {
+    :
+}

build-vm-lxc

@@ -176,6 +176,10 @@ vm_detach_swap_lxc() {
     :
 }
 
+vm_wipe_lxc() {
+    :
+}
+
 vm_cleanup_lxc() {
     if test $$ -ne 1 && test $$ -ne 2 ; then
         lxc_get_id

build-vm-openstack

@@ -125,6 +125,10 @@ vm_fixup_openstack() {
     chmod 0755 "$BUILD_ROOT/sbin/init"
 }
 
+vm_wipe_openstack() {
+    :
+}
+
 vm_kill_openstack() {
     if nova show "$VM_VOLUME_NAME" >/dev/null 2>&1 ; then
 	if ! nova delete "$VM_VOLUME_NAME" ; then

build-vm-pvm

@@ -166,6 +166,10 @@ vm_cleanup_pvm(){
     pvm_deletelv $swaplv
 }
 
+vm_wipe_pvm(){
+    :
+}
+
 vm_fixup_pvm(){
     VM_SWAPDEV=/dev/sdb
     GRUBDIR=`mktemp -d /tmp/grubinstall.XXXX`

build-vm-qemu

@@ -59,3 +59,7 @@ vm_cleanup_qemu() {
     vm_cleanup_kvm
 }
 
+vm_wipe_qemu() {
+    :
+}
+

build-vm-uml

@@ -64,3 +64,7 @@ vm_cleanup_uml() {
     :
 }
 
+vm_wipe_uml() {
+    :
+}
+

build-vm-xen

@@ -141,3 +141,7 @@ vm_cleanup_xen() {
     :
 }
 
+vm_wipe_xen() {
+    :
+}
+

build-vm-zvm

@@ -362,3 +362,6 @@ vm_cleanup_zvm() {
     fi
 }
 
+vm_wipe_zvm() {
+    :
+}