From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 17 Jul 2017 07:32:00 +0000 (+0200)
Subject: ceph-ansible-prs: improve teardown
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F788%2Fhead;p=ceph-build.git

ceph-ansible-prs: improve teardown

Delete with force any `fetch/` directories that could have been left after a
build.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/ceph-ansible-prs/build/teardown b/ceph-ansible-prs/build/teardown
index 27b9bfa6..d33c32f0 100644
--- a/ceph-ansible-prs/build/teardown
+++ b/ceph-ansible-prs/build/teardown
@@ -4,12 +4,13 @@
 
 cd $WORKSPACE/tests
 
-scenarios=$(find . | grep Vagrantfile | xargs dirname)
+scenarios=$(find . -name Vagrantfile | xargs dirname)
 
 for scenario in $scenarios; do
-    cd $scenario
+    pushd $scenario
     vagrant destroy -f
-    cd -
+    rm -rf fetch/
+    popd
 done
 
 # Sometimes, networks may linger around, so we must ensure they are killed: