X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ci%2F01-bootstrap.sh;h=88f87dd5c878a4ee0bd8ed44e9d3b0bbc2d45a10;hb=ce2fba8990b72144649ef1a8c94b6c30f7254dae;hp=c04ae2daf97025ccae8d452c14c9957e4525fefa;hpb=b5c5f74a35b7c2a3413bfac94811d8e6035aa3ae;p=joid.git

diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index c04ae2da..88f87dd5 100755
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -2,10 +2,21 @@
 
 set -ex
 
-juju bootstrap --debug --to bootstrap.maas
-sleep 5
-juju deploy juju-gui --to 0
+#export JUJU_DEV_FEATURE_FLAGS=address-allocation
 
-JUJU_REPOSITORY=
-juju set-constraints tags=
+jujuver=`juju --version`
 
+if [[ "$jujuver" < "2" ]]; then
+  juju bootstrap --debug --to bootstrap.maas --agent-version 1.25.5
+  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 substr($1, 1, length($1)-1)}' deployconfig.yaml`
+  cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
+  juju bootstrap $controllername $cloudname --debug --to bootstrap.maas
+fi