summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-09-21 09:15:30 +0000
committerNarinder Gupta <narinder.gupta@canonical.com>2017-09-21 09:15:30 +0000
commit3c64cb8ab8a0aa1ae03dfe43f4759100e3650b83 (patch)
tree379eb8b92b5b6e9848d3a2ecadbcf493ab161f4b /ci/deploy.sh
parent16c95e3ff61446c5cac0e1e683f8c3c72e0ad553 (diff)
Revert "modfiied to adjust timings as it seems download the container image is slow like few kbps."
This reverts commit 16c95e3ff61446c5cac0e1e683f8c3c72e0ad553. Change-Id: I6bca3a73ff16f21d4f53dedf7523f9d14aca369f Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-xci/deploy.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9277e857..d4c30d9d 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -272,7 +272,6 @@ deploy() {
#check whether charms are still executing the code even juju-deployer says installed.
check_status() {
waitstatus=$1
- waittime=$2
retval=0
timeoutiter=0
@@ -280,7 +279,7 @@ check_status() {
while [ $retval -eq 0 ]; do
if juju status | grep -q $waitstatus; then
echo_info "Still waiting for $waitstatus units"
- if [ $timeoutiter -ge $waittime ]; then
+ if [ $timeoutiter -ge 180 ]; then
echo_error 'Timed out'
retval=1
else
@@ -310,7 +309,7 @@ fi
echo_info "Deployment started"
deploy
-check_status executing 180
+check_status executing
echo_info "Deployment finished"
juju status --format=tabular
@@ -344,8 +343,8 @@ if ([ $opnfvmodel == "openstack" ]); then
elif ([ $opnfvmodel == "kubernetes" ]); then
#Workarounf for master chanrm as it takes 5 minutes to run properly
- check_status waiting 50
- check_status executing 50
+ check_status waiting
+ check_status executing
echo_info "Configuring Kubernetes deployment"
./k8.sh