Waiting by default for all containers to be terminated before rebuilding
We need to make sure all PODs are terminated before restarting otherwise
port-forward will fail
diff --git a/voltha b/voltha
index 3bc30d4..b76dff1 100755
--- a/voltha
+++ b/voltha
@@ -83,7 +83,7 @@
INSTALL_KUBECTL=${INSTALL_KUBECTL:-yes}
INSTALL_HELM=${INSTALL_HELM:-yes}
UPDATE_HELM_REPOS=${UPDATE_HELM_REPOS:-yes}
-WAIT_ON_DOWN=${WAIT_ON_DOWN:-no}
+WAIT_ON_DOWN=${WAIT_ON_DOWN:-yes}
VOLTHA_LOG_LEVEL=${VOLTHA_LOG_LEVEL:-WARN}
VOLTHA_CHART=${VOLTHA_CHART:-onf/voltha}
VOLTHA_CHART_VERSION=${VOLTHA_CHART_VERSION:-latest}
@@ -602,8 +602,10 @@
etcd-operator.* \
radius.* \
voltha-.*"
+ ONOS_PODS="onos-.*"
EXPECT=0
+ wait_for_pods "default" $EXPECT "not" -1 "Waiting for ONOS PODs to terminate" $ONOS_PODS
wait_for_pods "voltha" $EXPECT "not" -1 "Waiting for VOLTHA PODs to terminate" $PODS
fi
fi