diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/02-deploybundle.sh | 2 | ||||
| -rwxr-xr-x | ci/03-maasdeploy.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 26946bd4..1bb8e353 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -40,7 +40,7 @@ check_status() { juju status > status.txt if [ "$(grep -c "waiting" status.txt )" -ge 4 ]; then echo " still waiting for machines ..." - if [ $timeoutiter -ge 360 ]; then + if [ $timeoutiter -ge 240 ]; then retval=1 fi timeoutiter=$((timeoutiter+1)) diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 43c188e2..2d40d516 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -168,7 +168,7 @@ mkdir ~/.juju/ || true if [ ! -e ~maas/.ssh/id_rsa.pub ]; then sudo su - $USER -c "echo |ssh-keygen -t rsa -f $HOME/id_rsa_maas" sudo -u maas mkdir ~maas/.ssh/ || true - sudo cp $HOME/id_rsa_maas* ~maas/.ssh/id_rsa + sudo cp $HOME/id_rsa_maas ~maas/.ssh/id_rsa sudo cp $HOME/id_rsa_maas.pub ~maas/.ssh/id_rsa.pub fi |