commit 731193d2f6a6fcf6790950c40b091ffd46d92b1a
author Thomas Vachuska <tom@onlab.us> Thu Dec 10 11:41:46 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 10 20:27:21 2015 +0000
tree 99285b4dc20fcbb3df0d3a8ab2c193ac7333e6bc
parent c4178ccc5e9fdf9f3ff34b0e0a1b4359e8667442

Fixing archetypes so that the REST overlay works together with UI overlays.

Change-Id: Iab60f4cd07b59e1750ef0733883f4f7ecd0b3b46

tools/test/scenarios/setup.xml

diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index 071db8b..a53e317 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -33,15 +33,16 @@
             <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
                   requires="Install-${#},~Secure-SSH"/>
 
-            <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#}"
+            <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#}" delay="3"
                   requires="~Wait-for-Start-${#}"/>
-            <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
-                  requires="~Wait-for-Start-${#}"/>
-            <step name="Check-Components-${#}"
+            <step name="Check-Components-${#}" delay="5"
                   exec="onos-check-components ${OC#}"
-                  requires="~Wait-for-Start-${#},"/>
-            <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} ${ONOS_APPS} includes"
                   requires="~Wait-for-Start-${#}"/>
+
+            <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
+                  requires="~Check-Components-${#}"/>
+            <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} ${ONOS_APPS} includes"
+                  requires="~Check-Components-${#}"/>
         </parallel>
     </group>
 </scenario>