commit 18571b02fabeea8651953681b875cf832d376321
author Thomas Vachuska <tom@onlab.us> Sun May 31 22:30:06 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Sun May 31 22:42:06 2015 -0700
tree 1672771ce53316e2a81794eda6350280839ca6fd
parent 9f7d189d061cb05524d759fbda3f9fe022b71ace

Enhancing STC and scenarios.

Change-Id: I1227e68f8a44707f671b09dcd2967b580e14ca79

tools/test/scenarios/archetypes.xml

diff --git a/tools/test/scenarios/archetypes.xml b/tools/test/scenarios/archetypes.xml
index 42c4ffb..f83879c 100644
--- a/tools/test/scenarios/archetypes.xml
+++ b/tools/test/scenarios/archetypes.xml
@@ -18,28 +18,28 @@
         <step name="Clean-Up" cwd="${WORKSPACE}/tmp" env="~"
               exec="rm -r test-app"/>
 
-        <step name="Create-App" cwd="${WORKSPACE}/tmp" requires="Clean-Up"
+        <step name="Create-App" cwd="${WORKSPACE}/tmp" requires="^"
               exec="onos-create-app app org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>
         <step name="Build-App" requires="Create-App" exec="mvn clean install"/>
-        <step name="Install-App" requires="Build-App"
+        <step name="Install-App" requires="^"
               exec="onos-app ${OCI} install! target/test-app-1.2.3.oar"/>
-        <step name="Verify-App" requires="Install-App"
+        <step name="Verify-App" requires="^"
               exec="onos-check-components ${OCI} org.test.app.AppComponent"/>
 
         <step name="Create-App-CLI-Overlay" requires="Install-App"
               exec="onos-create-app cli org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>
-        <step name="Build-App-With-CLI" requires="Create-App-CLI-Overlay"
+        <step name="Build-App-With-CLI" requires="^"
               exec="mvn clean install"/>
-        <step name="Reinstall-App-With-CLI" requires="Build-App-With-CLI,-Verify-App"
+        <step name="Reinstall-App-With-CLI" requires="^,~Verify-App"
               exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
-        <step name="Verify-CLI" requires="Reinstall-App-With-CLI"
+        <step name="Verify-CLI" requires="^"
               exec="onos ${OCI} sample"/>
 
         <step name="Create-App-UI-Overlay" requires="Reinstall-App-With-CLI"
               exec="onos-create-app ui org.test.app test-app 1.2.3 org.test.app -DinteractiveMode=false"/>
-        <step name="Build-App-With-UI" requires="Create-App-UI-Overlay"
+        <step name="Build-App-With-UI" requires="^"
               exec="mvn clean install"/>
-        <step name="Reinstall-App-With-UI" requires="Build-App-With-UI,-Verify-CLI"
+        <step name="Reinstall-App-With-UI" requires="^,~Verify-CLI"
               exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
     </group>
 </scenario>