commit c1be5b80034ea49650fc30eeb3c15ad2efad1c75
author Jordan Halterman <jordan@opennetworking.org> Sat Aug 18 01:18:46 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Mon Aug 20 19:35:24 2018 +0000
tree 9d3d6ea62f9722a9986f1146bf24e78b401e5d72
parent cf7ce3bba6ae8f759d9a49cf151eb3018762d87f

Upgrade to Atomix 3.0.0-rc12

Change-Id: Id05018faa82195608d0ec6dae5cedc7a8899fc19

tools/test/bin/atomix-gen-config

diff --git a/tools/test/bin/atomix-gen-config b/tools/test/bin/atomix-gen-config
index 3521f2e..e69f441 100755
--- a/tools/test/bin/atomix-gen-config
+++ b/tools/test/bin/atomix-gen-config
@@ -135,7 +135,6 @@
           'type': 'raft',
           'partitions': 1,
           'partitionSize': len(nodes),
-          'flushOnCommit': False,
           'members': [node['id'] for node in nodes]
       },
       'partitionGroups': {
@@ -143,7 +142,6 @@
               'type': 'raft',
               'partitions': num_partitions,
               'partitionSize': partition_size,
-              'flushOnCommit': False,
               'members': [node['id'] for node in nodes]
           }
       }

tools/test/bin/atomix-install

diff --git a/tools/test/bin/atomix-install b/tools/test/bin/atomix-install
index 3147375..2c20f4a 100755
--- a/tools/test/bin/atomix-install
+++ b/tools/test/bin/atomix-install
@@ -47,7 +47,7 @@
     [ -f $ATOMIX_INSTALL_DIR/bin/atomix-agent ] && echo \"Atomix is already installed\" && exit 1
 
     sudo mkdir -p $ATOMIX_INSTALL_DIR && sudo chown ${ONOS_USER}:${ONOS_GROUP} $ATOMIX_INSTALL_DIR
-    sudo wget -O $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz https://oss.sonatype.org/content/repositories/releases/io/atomix/atomix-dist/3.0.0-rc11/atomix-dist-3.0.0-rc11.tar.gz
+    sudo wget -O $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz https://oss.sonatype.org/content/repositories/releases/io/atomix/atomix-dist/3.0.0-rc12/atomix-dist-3.0.0-rc12.tar.gz
     tar -xvf $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz -C $ATOMIX_INSTALL_DIR
 "
 

tools/test/scenarios/ha-multi-node.xml

diff --git a/tools/test/scenarios/ha-multi-node.xml b/tools/test/scenarios/ha-multi-node.xml
index 6b0ecae..d53d3ca 100644
--- a/tools/test/scenarios/ha-multi-node.xml
+++ b/tools/test/scenarios/ha-multi-node.xml
@@ -23,12 +23,8 @@
             <step name="Node-Death-${#}"
                   exec="onos-power ${OC#} off"/>
 
-            <step name="Validate-Death-${#}"
-                  requires="Node-Death-${#}"
-                  exec="onos-check-node-status ${OC#} INACTIVE"/>
-
             <step name="Breathe-${#}"
-                  requires="Validate-Death-${#}"
+                  requires="Node-Death-${#}"
                   exec="sleep 5"/>
 
             <step name="Node-Start-${#}"
@@ -61,7 +57,7 @@
 
             <step name="Check-All-Logs-${#}"
                   requires="~Check-Nodes-${#},~Check-Masters-${#},~Check-Components-${#},~Check-Apps-${#},~Check-Flows-${#}"
-                  exec="onos-check-all-logs --ignore-store-exceptions"/>
+                  exec="onos-check-all-logs"/>
         </sequential>
     </group>