X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F01-bootstrap.sh;h=4a20ca23816e04a0afda89662b17a3b6f07d1bf4;hb=f1dfc0776d32dea2a2fe7e2cb2b15b1836a6b666;hp=59a221979dca2f9bb509abf99170a24ef28e3eb2;hpb=947016a2eb2be266c8eaf183ea904b2bc204776b;p=joid.git

diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index 59a22197..4a20ca23 100755
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -4,11 +4,19 @@ set -ex
 
 #export JUJU_DEV_FEATURE_FLAGS=address-allocation
 
-juju bootstrap --debug --to bootstrap.maas
-sleep 5
-#disable juju gui until xenial charms are in charm store.
-juju deploy cs:juju-gui-130 --to 0
+jujuver=`juju --version`
 
-JUJU_REPOSITORY=
-juju set-constraints tags=
+if [ "$jujuver" -lt "2" ]; then
+  juju bootstrap --debug --to bootstrap.maas
+  sleep 5
+  #disable juju gui until xenial charms are in charm store.
+  juju deploy cs:juju-gui-130 --to 0
 
+  JUJU_REPOSITORY=
+  juju set-constraints tags=
+
+else
+  controllername=`awk 'NR==1{print $2}' environments.yaml`
+  cloudname=`awk 'NR==1{print $2}' environments.yaml`
+  juju bootstrap $controllername $cloudname --debug --to bootstrap.maas
+fi