diff options
| -rwxr-xr-x | ci/02-deploybundle.sh | 7 | ||||
| -rwxr-xr-x | ci/deploy.sh | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 396f5ea9..d10f3be6 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -26,6 +26,7 @@ fi #check whether charms are still executing the code even juju-deployer says installed. check_status() { waitstatus=$1 + waittime=$2 retval=0 timeoutiter=0 @@ -33,7 +34,7 @@ check_status() { while [ $retval -eq 0 ]; do if juju status | grep -q $waitstatus; then echo -n '.' - if [ $timeoutiter -ge 180 ]; then + if [ $timeoutiter -ge $waittime ]; then echo 'timed out' retval=1 else @@ -150,8 +151,8 @@ pastebinit bundles.yaml || true # with JUJU 2.0 bundles has to be deployed only once. juju deploy bundles.yaml --debug -sleep 120 -check_status allocating +sleep 720 +check_status allocating 220 # need to revisit later if not needed we will remove the below. openfile_fix() { diff --git a/ci/deploy.sh b/ci/deploy.sh index d4c30d9d..9277e857 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -272,6 +272,7 @@ deploy() { #check whether charms are still executing the code even juju-deployer says installed. check_status() { waitstatus=$1 + waittime=$2 retval=0 timeoutiter=0 @@ -279,7 +280,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 180 ]; then + if [ $timeoutiter -ge $waittime ]; then echo_error 'Timed out' retval=1 else @@ -309,7 +310,7 @@ fi echo_info "Deployment started" deploy -check_status executing +check_status executing 180 echo_info "Deployment finished" juju status --format=tabular @@ -343,8 +344,8 @@ if ([ $opnfvmodel == "openstack" ]); then elif ([ $opnfvmodel == "kubernetes" ]); then #Workarounf for master chanrm as it takes 5 minutes to run properly - check_status waiting - check_status executing + check_status waiting 50 + check_status executing 50 echo_info "Configuring Kubernetes deployment" ./k8.sh |