From: Michael Chapman <woppin@gmail.com>
Date: Fri, 29 Jan 2016 10:01:07 +0000 (+1100)
Subject: Touch baremetal images before vol-delete
X-Git-Tag: colorado.1.0~296^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e8a74a21aa0e477bdb9293bf37d546412d8427d1;p=apex.git

Touch baremetal images before vol-delete

Similar to the instack line above, the vol-delete will fail if the
baremetal image file is not present. This can happen if the disk
runs out of space during copy, for example.

Change-Id: Ib3a60dd03c3f7172cb59ade30e745397410e3ef2
---

diff --git a/ci/clean.sh b/ci/clean.sh
index 8b0c9bbc..f05b9136 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -34,6 +34,7 @@ rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null
 for i in $(seq 0 $vm_index); do
   virsh destroy baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n ''
   virsh undefine baremetalbrbm_brbm1_brbm2_brbm3_$i --remove-all-storage 2> /dev/null || echo -n ''
+  /usr/bin/touch /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2
   virsh vol-delete baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 --pool default 2> /dev/null
   rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 2> /dev/null
 done