diff options
| -rwxr-xr-x | ci/00-maasdeploy.sh | 4 | ||||
| -rwxr-xr-x | ci/01-bootstrap.sh | 2 | ||||
| -rwxr-xr-x | ci/clean.sh | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/ci/00-maasdeploy.sh b/ci/00-maasdeploy.sh index 527134d0..556b65ab 100755 --- a/ci/00-maasdeploy.sh +++ b/ci/00-maasdeploy.sh @@ -18,6 +18,10 @@ sudo apt-get install openssh-server bzr git maas-deployer juju juju-deployer \ maas-cli python-pip python-psutil python-openstackclient \ python-congressclient gsutil charm-tools pastebinit -y +sudo apt-get purge juju -y +wget https://launchpad.net/~juju/+archive/ubuntu/stable/+files/juju-core_1.25.5-0ubuntu1~14.04.2~juju1_amd64.deb +sudo dpkg -i juju-core_1.25.5-0ubuntu1~14.04.2~juju1_amd64.deb + #first parameter should be custom and second should be either # absolute location of file (including file name) or url of the # file to download. diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh index 4d265f32..b02b83d3 100755 --- a/ci/01-bootstrap.sh +++ b/ci/01-bootstrap.sh @@ -7,7 +7,7 @@ set -ex jujuver=`juju --version` if [[ "$jujuver" < "2" ]]; then - juju bootstrap --debug --to bootstrap.maas --agent-version 1.25.6 + 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 diff --git a/ci/clean.sh b/ci/clean.sh index 9324a91d..079828a0 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -21,6 +21,7 @@ if [[ "$jujuver" > "2" ]]; then rm -rf precise rm -rf trusty rm -rf xenial + sleep 30 sudo sysctl -w vm.drop_caches=3 elif [ -d $HOME/.juju/environments ]; then echo " " > status.txt |