summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-01-20 12:37:01 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-01-20 12:37:41 -0600
commit0ea68a4b427388fa4ab5db9e13fc4fa20d5f7179 (patch)
tree2b30f0e53a75c4cf83a0463cd9f27c05741acf5d /ci
parent2bd2918118d5b4543fc22fe43a8a0089d59f1d41 (diff)
typo
Change-Id: Iaaaffd8e0199cb7352c8547845b334e0ae4d4554 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/02-deploybundle.sh2
-rwxr-xr-xci/03-maasdeploy.sh2
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