Move tools.sh to ci/common dir

[joid.git] / ci / deploy.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 3985896..066b457 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-source tools.sh
+source common/tools.sh
 
 #need to put multiple cases here where decide this bundle to deploy by default use the odl bundle.
 # Below parameters are the default and we can according the release
@@ -202,16 +202,18 @@ deploy() {
         PROFILE=${PROFILE:-ubuntu}
         MAAS_IP=$(grep " ip_address" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //')
         API_SERVER="http://$MAAS_IP:5240/MAAS/api/2.0"
-        API_KEY=`sudo maas-region apikey --username=ubuntu`
-        maas login $PROFILE $API_SERVER $API_KEY
-
-        # make sure there is no machine entry in maas
-        for m in $(maas $PROFILE machines read | jq -r '.[].system_id')
-        do
-            maas $PROFILE machine delete $m || true
-        done
-        maas $PROFILE pod delete 1 || true
-
+        if which maas > /dev/null; then
+            API_KEY=`sudo maas-region apikey --username=ubuntu`
+            maas login $PROFILE $API_SERVER $API_KEY
+
+            # make sure there is no machine entry in maas
+            for m in $(maas $PROFILE machines read | jq -r '.[].system_id')
+            do
+                maas $PROFILE machine delete $m || true
+            done
+            podno=$(maas $PROFILE pods read | jq -r ".[]".id)
+            maas $PROFILE pod delete $podno || true
+        fi
         ./cleanvm.sh || true
 
         if [ "$virtinstall" -eq 1 ]; then