Merge pull request #18 from nhs-riak/develop-2.2.X-leveled-mas

Develop 2.2.x leveled mas

Author: martinsumner

group.sh

@@ -1,41 +1,106 @@
 #!/usr/bin/env bash
 set -e
 
-# $1 is group $2 is backend and $3 is config $4 is results directory
+die() {
+    printf '%s\n' "$1" >&2
+    exit 1
+}
 
+# Initialize all the option variables.
+# This ensures we are not contaminated by variables from the environment.
+GROUP=
+CONFIG=
+RES_DIR=
+BACKEND=
 
-echo "Running $1 with $2 and config $CONFIG"
+while :; do
+    case $1 in
+        -g|--group)
+            if [ "$2" ]; then
+                GROUP=$2
+                shift
+            else
+                die 'ERROR: "--group | -g" requires value (e.g. kv)'
+            fi
+            ;;
+        -c|--config)
+            if [ "$2" ]; then
+                CONFIG=$2
+                shift
+            else
+                die 'ERROR: "--config | -c" required (e.g. "spine")'
+            fi
+            ;;
+        -r|--res_dir)
+            if [ "$2" ]; then
+                RES_DIR=$2
+                shift
+            else
+                die 'ERROR: "--res_dir | -r" value required if flag present'
+            fi
+            ;;
+        -b|--backend)
+            if [ "$2" ]; then
+                BACKEND=$2
+                shift
+            else
+                die 'ERROR: "--backend | -b" value required if flag present'
+            fi
+            ;;
 
-if [ "$1" != "yoko" ]; then
-    TEST_EBIN=ebin
-else    
-    TEST_EBIN=~/yokozuna/riak_test/ebin
+        -?*)
+            printf 'WARN: Unknown option (ignored): %s\n' "$1" >&2
+            ;;
+        *)
+            break
+    esac
+
+    shift
+done
+
+if [ -z "$GROUP" ]; then
+    die "No group specified (-g | --group)"
 fi
 
-if [ "$1" != "2i" ]; then
-    BACKEND=${2:-bitcask}
+if [ -z "$CONFIG" ]; then
+    die "No config specified (-c | --config)"
+fi
+
+if [ "$GROUP" != "yoko" ]; then
+    TEST_EBIN=ebin
 else
-    BACKEND=eleveldb
+    TEST_EBIN=~/yokozuna/riak_test/ebin
 fi
 
-LOG=$1-$(date +"%FT%H%M")-$BACKEND
+LOG=$GROUP-$(date +"%FT%H%M")-${BACKEND:-default}
 
-CONFIG=${3:-rtdev}
-BASE_DIR=${4:-$LOG}
+BASE_DIR=${RES_DIR:-$LOG}
 
-echo "Backend is $BACKEND"
+echo "Running $GROUP with config $CONFIG"
+echo "Backend is ${BACKEND:-unspecified/default}"
+echo "Res dir is $BASE_DIR"
+echo "Test ebin $TEST_EBIN"
 
 # copy test beams
 echo "Copying beams"
-mkdir -p $BASE_DIR/group_tests/$1
-while read t; do  cp $TEST_EBIN/$t.beam $BASE_DIR/group_tests/$1;done <groups/$1
+mkdir -p $BASE_DIR/group_tests/$GROUP
+while read t; do cp $TEST_EBIN/$t.beam $BASE_DIR/group_tests/$GROUP;done <groups/$GROUP
 
 # run tests independently
-mkdir -p $BASE_DIR/results/$1
+mkdir -p $BASE_DIR/results/$GROUP
+
 echo "Running tests"
 
-for t in $BASE_DIR/group_tests/$1/*; do ./riak_test --batch -c $CONFIG -b $BACKEND -t $t; done | tee $BASE_DIR/results/$1/log
+if [ -z "$BACKEND"]; then
+    BECMD=
+else
+    BECMD="-b $BACKEND"
+fi
+
+echo "backend cmd $BECMD"
+
+for t in $BASE_DIR/group_tests/$GROUP/*; do ./riak_test --batch -c $CONFIG $BECMD -t $t; done | tee $BASE_DIR/results/$GROUP/log
 
 # output results
 echo "making summary"
-while read t; do grep $t-$BACKEND $BASE_DIR/results/$1/log ;done <groups/$1 | tee $BASE_DIR/results/$1/summary
+while read t; do grep $t- $BASE_DIR/results/$GROUP/log ;done <groups/$GROUP | tee $BASE_DIR/results/$GROUP/summary

groups/2i

@@ -5,4 +5,4 @@ verify_2i_mixed_cluster
 verify_2i_returnterms
 verify_2i_stream
 verify_2i_timeout
-verify_2i_eqc
+verify_2i_eqc

groups/2i_all

@@ -0,0 +1,6 @@
+secondary_index_tests
+verify_2i_aae
+verify_2i_limit
+verify_2i_returnterms
+verify_2i_stream
+verify_2i_timeout

groups/admin_all

@@ -0,0 +1,3 @@
+basic_command_line
+riak_admin_console_tests
+riaknostic_rt

groups/bitcask_only

@@ -0,0 +1,3 @@
+verify_bitcask_tombstone2_upgrade
+verify_no_writes_on_read
+kv679_dataloss_fb2

groups/cluster_upgrade

@@ -0,0 +1,20 @@
+loaded_upgrade
+node_confirms_upgrade
+open_source_replication
+repl_bucket_types
+replication_upgrade
+replication2_upgrade
+rolling_capabilities
+rt_cascading_new_to_old
+rt_cascading_mixed_clusters
+verify_basic_upgrade
+verify_capabilities
+verify_counter_capability
+verify_crdt_capability
+verify_dt_upgrade
+verify_handoff_mixed
+verify_head_capability
+verify_kv1356
+verify_membackend
+verify_riak_object_reformat
+verify_vclock_encoding_upgrade

groups/core_all

@@ -0,0 +1,18 @@
+bucket_props_roundtrip
+bucket_props_validation
+bucket_types
+cluster_meta_basic
+cluster_meta_rmr
+gh_riak_core_154
+gh_riak_core_155
+gh_riak_core_176
+http_bucket_types
+verify_build_cluster
+verify_build_cluster_caps_race
+verify_claimant
+verify_dynamic_ring
+verify_leave
+verify_listkeys_eqcfsm
+verify_reset_bucket_props
+verify_riak_lager
+verify_staged_clustering

groups/datatypes_all

@@ -0,0 +1,4 @@
+verify_counter_converge
+verify_dt_context
+verify_dt_converge
+verify_no_datatype_siblings

groups/eleveldb_only

@@ -0,0 +1,2 @@
+verify_2i_mixed_cluster
+cuttlefish_configuration

groups/eqc

@@ -0,0 +1 @@
+verify_2i_eqc