commit d326de189984f69c97abb36be00f622683442137
author Jordan Halterman <jordan@opennetworking.org> Tue Jul 31 11:57:21 2018 -0700
committer Jordan Halterman <jordan@opennetworking.org> Wed Aug 01 19:52:05 2018 +0000
tree 9fd6f784ebfe8719e724ed440b670c13ebb23e13
parent 686c85843cc5fe6069407002bb3f3b4509582846

Allow Atomix nodes to be deployed on shared  nodes for testing

Change-Id: I365c5bcd7744bef32bd887dbe6d20a5e635c4a0e

tools/test/scenarios/shutdown.xml

diff --git a/tools/test/scenarios/shutdown.xml b/tools/test/scenarios/shutdown.xml
index 6063c53..513677e 100644
--- a/tools/test/scenarios/shutdown.xml
+++ b/tools/test/scenarios/shutdown.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 <scenario name="shutdown" description="ONOS cluster shutdown">
-    <group name="Shutdown">
+    <group name="Shutdown-ONOS">
         <parallel var="${OC#}">
             <step name="Stop-Service-${#}" exec="onos-service ${OC#} stop"/>
             <step name="Wait-for-Stop-${#}" exec="onos-wait-for-stop ${OC#}"
@@ -23,4 +23,16 @@
                   requires="~Wait-for-Stop-${#}"/>
         </parallel>
     </group>
+    <group name="Shutdown-Atomix">
+        <group name="Shutdown-Atomix-OC" unless="${OCC1}">
+            <parallel var="${OC#}">
+                <step name="Atomix-Kill-${#}" env="~" exec="atomix-kill ${OC#}" requires="Shutdown-ONOS"/>
+            </parallel>
+        </group>
+        <group name="Shutdown-Atomix-OCC" if="${OCC1}">
+            <parallel var="${OCC#}">
+                <step name="Atomix-Kill-${#}" env="~" exec="atomix-kill ${OCC#}" requires="Shutdown-ONOS"/>
+            </parallel>
+        </group>
+    </group>
 </scenario>