commit 743d2b72617e5023ebd29fba374e4108db2c0fd8
author Thomas Vachuska <tom@opennetworking.org> Thu Nov 01 10:31:19 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Thu Nov 01 20:40:32 2018 +0000
tree 399c3d3ba3e525da9ff51ae4484aff72ff9ed7c0
parent 24b51f929e3308c36d419ed90cb3d26c0f505d60

Changing order of STC smoke test sub-scenarios to avoid an intermittent conflict.

Change-Id: I0a9cad8297940ce154c435b05bc4aed771304bff

tools/test/scenarios/smoke.xml

diff --git a/tools/test/scenarios/smoke.xml b/tools/test/scenarios/smoke.xml
index b1559fc..1bd4421 100644
--- a/tools/test/scenarios/smoke.xml
+++ b/tools/test/scenarios/smoke.xml
@@ -17,19 +17,19 @@
     <import file="${ONOS_SCENARIOS}/prerequisites.xml"/>
     <import file="${ONOS_SCENARIOS}/net-prerequisites.xml"/>
     <import file="${ONOS_SCENARIOS}/setup.xml"/>
-    <import file="${ONOS_SCENARIOS}/app-reactivate.xml"/>
     <import file="${ONOS_SCENARIOS}/dist-test.xml"/>
     <import file="${ONOS_SCENARIOS}/smoke-internal.xml"/>
+    <import file="${ONOS_SCENARIOS}/app-reactivate.xml"/>
     <import file="${ONOS_SCENARIOS}/yang-smoke.xml"/>
     <import file="${ONOS_SCENARIOS}/yang-live-compile.xml"/>
 
     <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/>
     <dependency name="Net-Smoke" requires="Setup"/>
-    <dependency name="App-Reactivation" requires="Setup"/>
     <dependency name="Drivers-Test" requires="Setup"/>
     <dependency name="Meta-App" requires="Setup"/>
     <dependency name="Netcfg" requires="Setup"/>
     <dependency name="Distributed-Primitives" requires="Setup"/>
+    <dependency name="App-Reactivation" requires="Setup,~Distributed-Primitives"/>
     <dependency name="YANG-Smoke" requires="Setup,~Distributed-Primitives"/>
     <dependency name="YANG-Live-Compile" requires="Setup,~YANG-Smoke"/>