| commit | db9b7f44d8359706248b2e5bfa62d34927cc1d41 | [log] [tgz] |
|---|---|---|
| author | Thomas Vachuska <tom@onlab.us> | Tue Nov 29 16:40:09 2016 -0800 |
| committer | Thomas Vachuska <tom@onlab.us> | Wed Nov 30 17:51:25 2016 +0000 |
| tree | b483a43e3216b69a1f96fc8e4e69e52faaedde9c | |
| parent | 1abfb633376f5c89be6ab95c4c1a16d12e4015c3 [diff] |
Added ability to kill ONOS process after waiting for it to peacefully stop. Change-Id: I5e768909622f7167e108929706471c054b245400
diff --git a/tools/test/bin/onos-wait-for-stop b/tools/test/bin/onos-wait-for-stop index ebb1d6d..a497422 100755 --- a/tools/test/bin/onos-wait-for-stop +++ b/tools/test/bin/onos-wait-for-stop
@@ -19,3 +19,8 @@ done exit 1 " + +[ $? -eq 0 ] && exit 0 +[ "$2" = "--kill" ] && onos-kill $node && exit 0 + +exit 1
diff --git a/tools/test/scenarios/ha-cluster-restart.xml b/tools/test/scenarios/ha-cluster-restart.xml index f0708c8..0abadbd 100644 --- a/tools/test/scenarios/ha-cluster-restart.xml +++ b/tools/test/scenarios/ha-cluster-restart.xml
@@ -21,7 +21,7 @@ <parallel var="${OC#}"> <step name="Node-Stop-${#}" exec="onos-service ${OC#} stop"/> <step name="Wait-for-Stop-${#}" requires="~Node-Stop-${#}" - exec="onos-wait-for-stop ${OC#}"/> + exec="onos-wait-for-stop ${OC#} ${ONOS_KILL_OPTION}"/> </parallel> </group>