홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
c544f631 1 parent d2afaf2a

Fixing STC scenarios. 

Change-Id: Ic5ec4696d414751f839dbb341717dcde0cb96cc9
Inline Side-by-side
Showing 2 changed files with 13 additions and 18 deletions
......@@ -30,9 +30,9 @@
<step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
requires="~Wait-for-Start-${#}"/>
<step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
requires="~Wait-for-Start-${#}"/>
requires="~Wait-for-Start-${#},Check-Logs-${#}"/>
<step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}"
requires="~Wait-for-Start-${#}"/>
requires="~Wait-for-Start-${#},Check-Logs-${#}"/>
</parallel>
</group>
</scenario>
......
......@@ -18,8 +18,7 @@
<step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
<parallel var="${OC#}">
<step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}"
unless="${OCT}"/>
<step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
<step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
<step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/>
......@@ -31,35 +30,31 @@
<step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
requires="~Wait-for-Start-${#}"/>
<step name="Check-Components-${#}"
exec="onos-check-components ${OC#}"
requires="~Wait-for-Start-${#}"/>
<step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
<step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers"
requires="~Wait-for-Start-${#}"/>
requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
<step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#} ${OC#}"
requires="~Wait-for-Start-${#}"/>
requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
</parallel>
</group>
<group name="Setup-Cluster" requires="Setup-Instances" unless="${NO_CLUSTER}">
<step name="Form-Cluster" exec="onos-form-cluster cell"/>
<parallel var="${OC#}">
<step name="Wait-for-Start-Again-${#}"
exec="onos-wait-for-start ${OC#}"
<step name="Wait-for-Start-Again-${#}" exec="onos-wait-for-start ${OC#}"
requires="Form-Cluster"/>
<step name="Check-Logs-Again-${#}" exec="onos-check-logs ${OC#}"
requires="~Wait-for-Start-Again-${#}"/>
<step name="Check-Components-Again-${#}"
exec="onos-check-components ${OC#}"
requires="~Wait-for-Start-Again-${#}"/>
<step name="Check-Apps-Again-${#}"
exec="onos-check-apps ${OC#} drivers"
requires="~Wait-for-Start-Again-${#}"/>
<step name="Check-Components-Again-${#}" exec="onos-check-components ${OC#}"
requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
<step name="Check-Apps-Again-${#}" exec="onos-check-apps ${OC#} drivers"
requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
<step name="Check-Nodes-Again-${#}" exec="onos-check-nodes ${OC#}"
requires="~Wait-for-Start-Again-${#}"/>
requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
</parallel>
</group>
......