modified to autostart the VMs created for bootstrap and virtual

[joid.git] / ci / clean.sh

diff --git a/ci/clean.sh b/ci/clean.sh
index 68d4dd3..feecd70 100755 (executable)
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -7,7 +7,11 @@ jujuver=`juju --version`
 if [[ "$jujuver" > "2" ]]; then
     if [ ! -d labconfig.yaml ]; then
         cp ~/joid_config/labconfig.yaml ./labconfig.yaml || true
-        cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml || true
+        if [ -d $HOME/joid_config/deployconfig.yaml ]; then
+            cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml || true
+        else
+            python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
+        fi
     fi
 else
     if [ ! -d environments.yaml ]; then
@@ -20,10 +24,12 @@ fi
 if [[ "$jujuver" > "2" ]]; then
     controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
     cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
+    juju destroy-controller $controllername --destroy-all-models -y || true
     juju kill-controller $controllername --timeout 10s -y || true
     rm -rf precise
     rm -rf trusty
     rm -rf xenial
+    rm -rf ~/joid_config/admin-openrc
     sleep 30
     sudo sysctl -w vm.drop_caches=3
 elif [ -d $HOME/.juju/environments ]; then