summaryrefslogtreecommitdiff
path: root/evergreen
diff options
context:
space:
mode:
Diffstat (limited to 'evergreen')
-rw-r--r--evergreen/jepsen_docker/list-append.sh16
-rw-r--r--evergreen/jepsen_test_run.sh5
2 files changed, 18 insertions, 3 deletions
diff --git a/evergreen/jepsen_docker/list-append.sh b/evergreen/jepsen_docker/list-append.sh
index 3eb8a8b67fa..4378b1bcadc 100644
--- a/evergreen/jepsen_docker/list-append.sh
+++ b/evergreen/jepsen_docker/list-append.sh
@@ -18,8 +18,18 @@ elapsed_secs=$((end_time - start_time))
cd ../../
mkdir -p src/jepsen-mongodb
sudo docker cp jepsen-control:/jepsen/mongodb/store src/jepsen-mongodb/store
-cp jepsen/docker/jepsen_${task_name}_${execution}.log src/jepsen-mongodb
+cp jepsen/docker/jepsen_${task_name}_${execution}.log src/jepsen-mongodb/
sudo docker cp jepsen-control:/jepsen/mongodb src/jepsen-workdir
-cd src/jepsen-mongodb
-. ../evergreen/jepsen_report.sh
+cd src
+activate_venv
+$python buildscripts/jepsen_report.py --start_time=$start_time --end_time=$end_time --elapsed=$elapsed_secs --emit_status_files --store ./jepsen-mongodb jepsen-mongodb/jepsen_${task_name}_${execution}.log
+exit_code=$?
+cat report.json
+
+if [ -f "jepsen_system_fail.txt" ]; then
+ mv jepsen_system_fail.txt jepsen-mongodb/jepsen_system_failure_${task_name}_${execution}
+ exit 0
+fi
+
+exit $exit_code
diff --git a/evergreen/jepsen_test_run.sh b/evergreen/jepsen_test_run.sh
index 2cf8b0ed387..b5f79426079 100644
--- a/evergreen/jepsen_test_run.sh
+++ b/evergreen/jepsen_test_run.sh
@@ -16,6 +16,11 @@ mkdir -p $TMPDIR
export _JAVA_OPTIONS=-Djava.io.tmpdir=$TMPDIR
start_time=$(date +%s)
+# XXX Do not run this test in a loop or with Jepsen's repeat flag
+# the report generator (jepsen_report.sh) does not support parsing more than one
+# test at a time. If you need to run these tests with a repeat flag, you
+# will need to adopt buildscripts/jepsen_report.py to support the log output
+# of older-style Jepsen tests
lein run test --test ${jepsen_test_name} \
--mongodb-dir ../ \
--working-dir ${workdir}/src/jepsen-workdir \