summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbifrost/scripts/destroy-env.sh3
-rwxr-xr-xxci/xci-deploy.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/bifrost/scripts/destroy-env.sh b/bifrost/scripts/destroy-env.sh
index ce9d5353..d570f10a 100755
--- a/bifrost/scripts/destroy-env.sh
+++ b/bifrost/scripts/destroy-env.sh
@@ -14,6 +14,9 @@ if [[ $(whoami) != "root" ]]; then
exit 1
fi
+# Start fresh
+rm -rf /opt/stack
+
# Delete all libvirt VMs and hosts from vbmc (look for a port number)
for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do
virsh destroy $vm || true
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 326d659d..277206dc 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -40,7 +40,7 @@ echo "-------------------------------------------------------------------------"
#-------------------------------------------------------------------------------
echo "Info: Cleaning up the previous deployment"
$XCI_PATH/../bifrost/scripts/destroy-env.sh > /dev/null 2>&1
-/bin/rm -rf /opt/releng /opt/bifrost /opt/openstack-ansible /opt/stack
+/bin/rm -rf /opt/releng /opt/bifrost /opt/openstack-ansible
#-------------------------------------------------------------------------------
# Clone the repositories and checkout the versions