making default series to xenial.

[joid.git] / ci / 01-bootstrap.sh

diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index 4a20ca2..a946b0f 100755 (executable)
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -2,21 +2,6 @@
 
 set -ex
 
-#export JUJU_DEV_FEATURE_FLAGS=address-allocation
-
-jujuver=`juju --version`
-
-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
+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 --bootstrap-series=xenial