diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-02-06 07:52:10 +0000 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-02-06 09:56:28 +0000 |
| commit | 84ada1dcf327874f148c97c55d7f4e3876e7a62c (patch) | |
| tree | 53bab7ace17c41a825eb9c9bc4a4786d2054014f | |
| parent | 29bfb487792f2361671e1b325f6bddf10753f2ed (diff) | |
fix ppa path juju/dev --> juju/devel
also deleting "set -e" from cleanvm.sh
Change-Id: I0404abf63e158d93d5193a4c74bd4075ffed6efc
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
| -rwxr-xr-x | ci/03-maasdeploy.sh | 4 | ||||
| -rwxr-xr-x | ci/cleanvm.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index ce9d7312..66a7fd03 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -10,7 +10,7 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then fi #install the packages needed -sudo apt-add-repository ppa:juju/dev -y +sudo apt-add-repository ppa:juju/devel -y sudo apt-add-repository ppa:maas/stable -y sudo apt-add-repository cloud-archive:newton -y sudo apt-get update -y @@ -401,7 +401,7 @@ if [ "$virtinstall" -eq 1 ]; then fi # lets sleep for around 5 more minutes to make sure all images are in sync. -sleep(300) +sleep 300 #lets add the nodes now. Currently works only for virtual deploymnet. addnodes diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh index d4f1f3bd..3756c406 100755 --- a/ci/cleanvm.sh +++ b/ci/cleanvm.sh @@ -1,12 +1,12 @@ #!/bin/bash -set -ex +set -x echo " Cleanup Started ..." #use the below commands if you needs to delete the virtual machine # also along with envuronment destroy. -./clean.sh || true +./clean.sh vm_list=$(sudo virsh list --all) |