X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fclean.sh;h=f05b91364f12c8ce917a5344988ddc77aeffac80;hb=1a2a9580cbd5dccdc11399d2cae47d02217be860;hp=45486de0fb76c4ba0def7c504fe8c0150655cb27;hpb=9a11a203fa228cad7a86ebf2cb28ae834d17decd;p=apex.git

diff --git a/ci/clean.sh b/ci/clean.sh
index 45486de0..f05b9136 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -1,4 +1,12 @@
 #!/usr/bin/env bash
+##############################################################################
+# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 
 #Clean script to uninstall provisioning server for Apex
 #author: Dan Radez (dradez@redhat.com)
@@ -13,7 +21,7 @@ ovs_bridges="brbm brbm1 brbm2 brbm3"
 # Clean off instack VM
 virsh destroy instack 2> /dev/null || echo -n ''
 virsh undefine instack --remove-all-storage 2> /dev/null || echo -n ''
-if ! virsh vol-delete instack.qcow2 --pool default; then
+if ! virsh vol-delete instack.qcow2 --pool default 2> /dev/null; then
   if [ ! -e /var/lib/libvirt/images/instack.qcow2 ]; then
     /usr/bin/touch /var/lib/libvirt/images/instack.qcow2
     virsh vol-delete instack.qcow2 --pool default
@@ -26,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
@@ -34,7 +43,7 @@ done
 for bridge in ${ovs_bridges}; do
   virsh net-destroy ${bridge} 2> /dev/null
   virsh net-undefine ${bridge} 2> /dev/null
-  if detach_interface_from_ovs ${bridge}; then
+  if detach_interface_from_ovs ${bridge} 2> /dev/null; then
     ovs-vsctl del-br ${bridge} 2> /dev/null
   fi
 done