Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
modfiied to adjust timings as it seems download the container
[joid.git]
/
ci
/
deploy.sh
diff --git
a/ci/deploy.sh
b/ci/deploy.sh
index
d4c30d9
..
9277e85
100755
(executable)
--- 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
#check whether charms are still executing the code even juju-deployer says installed.
check_status() {
waitstatus=$1
+ waittime=$2
retval=0
timeoutiter=0
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"
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
echo_error 'Timed out'
retval=1
else
@@
-309,7
+310,7
@@
fi
echo_info "Deployment started"
deploy
echo_info "Deployment started"
deploy
-check_status executing
+check_status executing
180
echo_info "Deployment finished"
juju status --format=tabular
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
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
echo_info "Configuring Kubernetes deployment"
./k8.sh