X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fclean.sh;h=feecd70a83e349a3273bb28d522b639a0a71be12;hb=c7b95f1cdee6d3df0577664ea511a746968add4a;hp=68d4dd36f8ff9a2ec31056cf8456897aec1c9973;hpb=fe8f6531947ae65939e977117f9b281fbe14bed3;p=joid.git

diff --git a/ci/clean.sh b/ci/clean.sh
index 68d4dd36..feecd70a 100755
--- 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