2 files changed, 12 insertions, 36 deletions
diff --git a/evergreen/jepsen_docker/list-append.sh b/evergreen/jepsen_docker/list-append.sh
index 3eb8a8b67fa..2204a6a2e9b 100644
--- a/evergreen/jepsen_docker/list-append.sh
+++ b/evergreen/jepsen_docker/list-append.sh
@@ -18,8 +18,17 @@ 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=$?
+
+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_docker/setup.sh b/evergreen/jepsen_docker/setup.sh
index cc76e20e541..38c73cecbec 100644
--- a/evergreen/jepsen_docker/setup.sh
+++ b/evergreen/jepsen_docker/setup.sh
@@ -1,38 +1,5 @@
 set -euo pipefail
 
-if [ ! $(which docker) ]; then
-  sudo apt-get update
-  sudo apt-get install -yq \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg \
-    lsb-release
-
-  if [ ! -f "/usr/share/keyrings/docker-archive-keyring.gpg" ]; then
-    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-  fi
-
-  set +e
-  if ! grep "https://download.docker.com/linux/debian" "/etc/apt/sources.list.d/docker.list"; then
-    echo \
-      "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
-            $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-  fi
-  set -e
-
-  sudo apt-get update
-  sudo apt-get install -yq docker-ce docker-ce-cli containerd.io
-  sudo docker run hello-world
-fi
-
-if [ ! $(which docker-compose) ]; then
-  sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose
-  sudo chmod +x /usr/bin/docker-compose
-fi
-
-sudo chmod 777 /var/run/docker.sock
-
 git clone --branch=evergreen-master git@github.com:10gen/jepsen.git jepsen
 cp -rf src/dist-test jepsen/docker/node
 # place the mongodb jepsen test adjacent to the control node's Dockerfile.