Merge "Fix test that checks whether insances from previous runs need to be removed"

This commit is contained in:
Jenkins 2012-01-24 19:12:47 +00:00 committed by Gerrit Code Review
commit 35780e1d34

View File

@ -929,7 +929,7 @@ if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then
# Destroy old instances # Destroy old instances
instances=`virsh list --all | grep $INSTANCE_NAME_PREFIX | sed "s/.*\($INSTANCE_NAME_PREFIX[0-9a-fA-F]*\).*/\1/g"` instances=`virsh list --all | grep $INSTANCE_NAME_PREFIX | sed "s/.*\($INSTANCE_NAME_PREFIX[0-9a-fA-F]*\).*/\1/g"`
if [ ! $instances = "" ]; then if [ ! "$instances" = "" ]; then
echo $instances | xargs -n1 virsh destroy || true echo $instances | xargs -n1 virsh destroy || true
echo $instances | xargs -n1 virsh undefine || true echo $instances | xargs -n1 virsh undefine || true
fi fi