Skip to content

Commit 8c6c92b

Browse files
martinsumnermartinsumner
authored
Merge pull request #1308 from nhs-riak/develop-2.9
Develop 2.9
2 parents 35519ae + 57d638e commit 8c6c92b

File tree

83 files changed

+5032
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+5032
-481
lines changed

‎group.sh‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
die() {
5+
printf '%s\n' "$1" >&2
6+
exit 1
7+
}
8+
9+
# Initialize all the option variables.
10+
# This ensures we are not contaminated by variables from the environment.
11+
GROUP=
12+
CONFIG=
13+
RES_DIR=
14+
BACKEND=
15+
16+
while :; do
17+
case $1 in
18+
-g|--group)
19+
if [ "$2" ]; then
20+
GROUP=$2
21+
shift
22+
else
23+
die 'ERROR: "--group | -g" requires value (e.g. kv)'
24+
fi
25+
;;
26+
-c|--config)
27+
if [ "$2" ]; then
28+
CONFIG=$2
29+
shift
30+
else
31+
die 'ERROR: "--config | -c" required (e.g. "spine")'
32+
fi
33+
;;
34+
-r|--res_dir)
35+
if [ "$2" ]; then
36+
RES_DIR=$2
37+
shift
38+
else
39+
die 'ERROR: "--res_dir | -r" value required if flag present'
40+
fi
41+
;;
42+
-b|--backend)
43+
if [ "$2" ]; then
44+
BACKEND=$2
45+
shift
46+
else
47+
die 'ERROR: "--backend | -b" value required if flag present'
48+
fi
49+
;;
50+
51+
-?*)
52+
printf 'WARN: Unknown option (ignored): %s\n' "$1" >&2
53+
;;
54+
*)
55+
break
56+
esac
57+
58+
shift
59+
done
60+
61+
if [ -z "$GROUP" ]; then
62+
die "No group specified (-g | --group)"
63+
fi
64+
65+
if [ -z "$CONFIG" ]; then
66+
die "No config specified (-c | --config)"
67+
fi
68+
69+
if [ "$GROUP" != "yoko" ]; then
70+
TEST_EBIN=ebin
71+
else
72+
TEST_EBIN=~/yokozuna/riak_test/ebin
73+
fi
74+
75+
LOG=$GROUP-$(date +"%FT%H%M")-${BACKEND:-default}
76+
77+
BASE_DIR=${RES_DIR:-$LOG}
78+
79+
echo "Running $GROUP with config $CONFIG"
80+
echo "Backend is ${BACKEND:-unspecified/default}"
81+
echo "Res dir is $BASE_DIR"
82+
echo "Test ebin $TEST_EBIN"
83+
84+
# copy test beams
85+
echo "Copying beams"
86+
mkdir -p $BASE_DIR/group_tests/$GROUP
87+
while read t; do cp $TEST_EBIN/$t.beam $BASE_DIR/group_tests/$GROUP;done <groups/$GROUP
88+
89+
# run tests independently
90+
mkdir -p $BASE_DIR/results/$GROUP
91+
92+
echo "Running tests"
93+
94+
if [ -z "$BACKEND"]; then
95+
BECMD=
96+
else
97+
BECMD="-b $BACKEND"
98+
fi
99+
100+
echo "backend cmd $BECMD"
101+
102+
for t in $BASE_DIR/group_tests/$GROUP/*; do ./riak_test --batch -c $CONFIG $BECMD -t $t; done | tee $BASE_DIR/results/$GROUP/log
103+
104+
# output results
105+
echo "making summary"
106+
while read t; do grep $t- $BASE_DIR/results/$GROUP/log ;done <groups/$GROUP | tee $BASE_DIR/results/$GROUP/summary

‎groups.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
3+
# $1 is backend $2 is riak test profile
4+
5+
set -e
6+
7+
echo "making results dir"
8+
9+
BASE_DIR=$(date +"%FT%H%M")-$BACKEND
10+
mkdir -p $BASE_DIR
11+
12+
for group in groups/*; do ./group.sh $(basename $group) $1 $2 $BASE_DIR; done

‎groups/2i‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
secondary_index_tests
2+
verify_2i_aae
3+
verify_2i_limit
4+
verify_2i_mixed_cluster
5+
verify_2i_returnterms
6+
verify_2i_stream
7+
verify_2i_timeout
8+
verify_2i_eqc

‎groups/2i_all‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
secondary_index_tests
2+
verify_2i_aae
3+
verify_2i_limit
4+
verify_2i_returnterms
5+
verify_2i_stream
6+
verify_2i_timeout

‎groups/admin‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
basic_command_line
2+
cuttlefish_configuration
3+
riak_admin_console_tests
4+
riaknostic_rt

‎groups/admin_all‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
basic_command_line
2+
riak_admin_console_tests
3+
riaknostic_rt

‎groups/bitcask_only‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
verify_bitcask_tombstone2_upgrade
2+
verify_no_writes_on_read
3+
kv679_dataloss_fb2

‎groups/cluster_upgrade‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
loaded_upgrade
2+
node_confirms_upgrade
3+
open_source_replication
4+
repl_bucket_types
5+
replication_upgrade
6+
replication2_upgrade
7+
rolling_capabilities
8+
rt_cascading_new_to_old
9+
rt_cascading_mixed_clusters
10+
verify_basic_upgrade
11+
verify_capabilities
12+
verify_counter_capability
13+
verify_crdt_capability
14+
verify_dt_upgrade
15+
verify_handoff_mixed
16+
verify_head_capability
17+
verify_kv1356
18+
verify_membackend
19+
verify_riak_object_reformat
20+
verify_vclock_encoding_upgrade

‎groups/core‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
bucket_props_roundtrip
2+
bucket_props_validation
3+
verify_reset_bucket_props
4+
bucket_types
5+
cluster_meta_basic
6+
cluster_meta_rmr
7+
gh_riak_core_154
8+
gh_riak_core_155
9+
gh_riak_core_176
10+
http_bucket_types
11+
rolling_capabilities
12+
verify_build_cluster
13+
verify_build_cluster_caps_race
14+
verify_capabilities
15+
verify_claimant
16+
verify_dynamic_ring
17+
verify_leave
18+
verify_no_writes_on_read
19+
verify_reset_bucket_props
20+
verify_riak_lager
21+
verify_staged_clustering
22+
verify_listkeys_eqcfsm

‎groups/core_all‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
bucket_props_roundtrip
2+
bucket_props_validation
3+
bucket_types
4+
cluster_meta_basic
5+
cluster_meta_rmr
6+
gh_riak_core_154
7+
gh_riak_core_155
8+
gh_riak_core_176
9+
http_bucket_types
10+
verify_build_cluster
11+
verify_build_cluster_caps_race
12+
verify_claimant
13+
verify_dynamic_ring
14+
verify_leave
15+
verify_listkeys_eqcfsm
16+
verify_reset_bucket_props
17+
verify_riak_lager
18+
verify_staged_clustering

0 commit comments

Comments
 (0)