From: Thomas F Herbert <therbert@redhat.com>
Date: Fri, 12 Feb 2016 21:09:55 +0000 (-0500)
Subject: Run clean.sh scripts with sudo and set relative path
X-Git-Tag: colorado.1.0~43
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F9915%2F4;p=ovsnfv.git

Run clean.sh scripts with sudo and set relative path
so sudo can find it.
Change to correct directory before running cleanup.

Change-Id: I3a91cb8f25c641b81ef2c62f91b540d7657eeb53
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---

diff --git a/build/instack_ovs.sh b/build/instack_ovs.sh
index 5af6ccf..83b141c 100755
--- a/build/instack_ovs.sh
+++ b/build/instack_ovs.sh
@@ -194,7 +194,7 @@ fi
 sudo rm -f /tmp/instack.answers
 
 # ensure that no previous undercloud VMs are running
-clean.sh
+sudo ../ci/clean.sh
 # and rebuild the bare undercloud VMs
 ssh -T ${SSH_OPTIONS[@]} stack@localhost <<EOI
     set -e
diff --git a/ci/buildovs.sh b/ci/buildovs.sh
index db3ac9b..1164733 100755
--- a/ci/buildovs.sh
+++ b/ci/buildovs.sh
@@ -87,7 +87,7 @@ BuildAndTestOVS.sh -d -p none -t
 echo "---------------------------------------"
 echo "Cleanup temporary dirs"
 echo
-cd $BUILDDIR
+cd $BUILD_BASE
 
 if [ -d $TMPDIR ]
 then
@@ -112,6 +112,6 @@ fi
 # Destroy VM if one has been deployed. Also remove any local installation of
 # DPDK and OVS
 #
-clean.sh
+sudo ../ci/clean.sh
 
 exit 0