summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas F Herbert <therbert@redhat.com>2016-02-12 16:09:55 -0500
committerThomas F Herbert <therbert@redhat.com>2016-02-13 12:28:27 -0500
commit8c3385a7f73731316c70f976d45c0e962651f374 (patch)
treeb4c40fea470a711a83a8efb7533de7b69e7d15bc
parent9e14e09a0f1c986d88b239cc683f24bb850807de (diff)
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>
-rwxr-xr-xbuild/instack_ovs.sh2
-rwxr-xr-xci/buildovs.sh4
2 files changed, 3 insertions, 3 deletions
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