Thomas Vachuska

Fixing STC scenarios.

Change-Id: Ic17f7a19c35503ab77219f0ffc539b546cb90fba
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
20 <parallel var="${OC#}"> 20 <parallel var="${OC#}">
21 <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/> 21 <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
22 <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/> 22 <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
23 + <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/>
23 24
24 <step name="Install-${#}" exec="onos-install ${OC#}" 25 <step name="Install-${#}" exec="onos-install ${OC#}"
25 requires="Uninstall-${#},Push-Bits-${#},Push-Bits"/> 26 requires="Uninstall-${#},Push-Bits-${#},Push-Bits"/>
...@@ -30,9 +31,9 @@ ...@@ -30,9 +31,9 @@
30 <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}" 31 <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
31 requires="~Wait-for-Start-${#}"/> 32 requires="~Wait-for-Start-${#}"/>
32 <step name="Check-Components-${#}" exec="onos-check-components ${OC#}" 33 <step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
33 - requires="~Wait-for-Start-${#},Check-Logs-${#}"/> 34 + requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
34 <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}" 35 <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}"
35 - requires="~Wait-for-Start-${#},Check-Logs-${#}"/> 36 + requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
36 </parallel> 37 </parallel>
37 </group> 38 </group>
38 </scenario> 39 </scenario>
......