홍길동 / 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 @@ ...@@ -30,9 +30,9 @@
30 <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}" 30 <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
31 requires="~Wait-for-Start-${#}"/> 31 requires="~Wait-for-Start-${#}"/>
32 <step name="Check-Components-${#}" exec="onos-check-components ${OC#}" 32 <step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
33 - requires="~Wait-for-Start-${#}"/> 33 + requires="~Wait-for-Start-${#},Check-Logs-${#}"/>
34 <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}" 34 <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}"
35 - requires="~Wait-for-Start-${#}"/> 35 + requires="~Wait-for-Start-${#},Check-Logs-${#}"/>
36 </parallel> 36 </parallel>
37 </group> 37 </group>
38 </scenario> 38 </scenario>
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
18 <step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/> 18 <step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
19 19
20 <parallel var="${OC#}"> 20 <parallel var="${OC#}">
21 - <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" 21 + <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
22 - unless="${OCT}"/>
23 <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/> 22 <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
24 <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/> 23 <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/>
25 24
...@@ -31,35 +30,31 @@ ...@@ -31,35 +30,31 @@
31 30
32 <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}" 31 <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
33 requires="~Wait-for-Start-${#}"/> 32 requires="~Wait-for-Start-${#}"/>
34 - <step name="Check-Components-${#}" 33 + <step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
35 - exec="onos-check-components ${OC#}" 34 + requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
36 - requires="~Wait-for-Start-${#}"/>
37 <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers" 35 <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers"
38 - requires="~Wait-for-Start-${#}"/> 36 + requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
39 37
40 <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#} ${OC#}" 38 <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#} ${OC#}"
41 - requires="~Wait-for-Start-${#}"/> 39 + requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
42 </parallel> 40 </parallel>
43 </group> 41 </group>
44 42
45 <group name="Setup-Cluster" requires="Setup-Instances" unless="${NO_CLUSTER}"> 43 <group name="Setup-Cluster" requires="Setup-Instances" unless="${NO_CLUSTER}">
46 <step name="Form-Cluster" exec="onos-form-cluster cell"/> 44 <step name="Form-Cluster" exec="onos-form-cluster cell"/>
47 <parallel var="${OC#}"> 45 <parallel var="${OC#}">
48 - <step name="Wait-for-Start-Again-${#}" 46 + <step name="Wait-for-Start-Again-${#}" exec="onos-wait-for-start ${OC#}"
49 - exec="onos-wait-for-start ${OC#}"
50 requires="Form-Cluster"/> 47 requires="Form-Cluster"/>
51 48
52 <step name="Check-Logs-Again-${#}" exec="onos-check-logs ${OC#}" 49 <step name="Check-Logs-Again-${#}" exec="onos-check-logs ${OC#}"
53 requires="~Wait-for-Start-Again-${#}"/> 50 requires="~Wait-for-Start-Again-${#}"/>
54 - <step name="Check-Components-Again-${#}" 51 + <step name="Check-Components-Again-${#}" exec="onos-check-components ${OC#}"
55 - exec="onos-check-components ${OC#}" 52 + requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
56 - requires="~Wait-for-Start-Again-${#}"/> 53 + <step name="Check-Apps-Again-${#}" exec="onos-check-apps ${OC#} drivers"
57 - <step name="Check-Apps-Again-${#}" 54 + requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
58 - exec="onos-check-apps ${OC#} drivers"
59 - requires="~Wait-for-Start-Again-${#}"/>
60 55
61 <step name="Check-Nodes-Again-${#}" exec="onos-check-nodes ${OC#}" 56 <step name="Check-Nodes-Again-${#}" exec="onos-check-nodes ${OC#}"
62 - requires="~Wait-for-Start-Again-${#}"/> 57 + requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
63 </parallel> 58 </parallel>
64 </group> 59 </group>
65 60
......