diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2015-12-10 15:02:15 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2015-12-11 06:09:34 -0600 |
commit | 85e65d41f1cdc9c9291fb5b2de29c02f0e57b405 (patch) | |
tree | c5d39fa342ec759c991868575fa1deb682c49bbb /ci/deploy.sh | |
parent | e881980f26d97ee17a9c72cb25226e2ef36a96bc (diff) |
modified the yaml on request from David from Orange so that
devices option can be modified to format the osd device.
modified deploy.sh so that return value is positive.
Change-Id: Idc94f4a99889df88bfae6446ce212050a570d30a
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-x | ci/deploy.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 92d17e20..12806253 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -77,10 +77,20 @@ deploy() { } check_status() { - while [ $? -eq 0 ]; do - sleep 60 - echo " still executing the reltionship within charms ..." - juju status | grep executing > /dev/null + retval=0 + timeoutiter=0 + while [ $retval -eq 0 ]; do + sleep 30 + juju status > status.txt + if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then + echo " still executing the reltionship within charms ..." + if [ $timeoutiter -ge 60 ] then + retval=1 + fi + timeoutiter=$((timeoutiter+1)) + else + retval=1 + fi done echo "...... deployment finishing ......." } |