From b05eecbff2f8bdde1056e2e2f18e3991897ba0ea Mon Sep 17 00:00:00 2001
From: Alex Kasko <alex@staticlibs.net>
Date: Sun, 18 Oct 2026 19:06:55 +0100
Subject: [PATCH] Fix Jepsen runs on CI (2.0)

This is a backport of the PR #932 to `v2.0-cyanoptera` branch.
---
 .github/workflows/Java.yml | 10 ++++++++--
 data/jepsen/jepsen.patch   | 13 +++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
index b7481799f..1bb9b2b26 100644
--- a/.github/workflows/Java.yml
+++ b/.github/workflows/Java.yml
@@ -213,7 +213,6 @@ jobs:
           java ${{ github.workspace }}/src/test/external/RunGraalNativeImage.java \
             ${{ github.workspace }}/src/test/external/graal
 
-
   java-linux-amd64-spark:
     name: Linux Spark (amd64)
     runs-on: ubuntu-latest
@@ -472,6 +471,13 @@ jobs:
           sudo update-alternatives --set javac /usr/lib/jvm/java-21-openjdk-amd64/bin/javac
           /usr/bin/java --version
 
+      - name: Check JDK version
+        run: |
+          which java
+          java -version
+          echo $JAVA_HOME
+          $JAVA_HOME/bin/java -version
+
       - name: Install JAR
         run: |
           mvn -B -ntp --version
@@ -487,7 +493,7 @@ jobs:
         run: |
           patch -p1 < ${{ github.workspace }}/data/jepsen/jepsen.patch
           lein --version
-          python ../scripts/retry.py --timeout 5m -- \
+          python ../scripts/retry.py --retries 1 --timeout 5m -- \
             lein run test \
             --time-limit 10 \
             --max-writes-per-key 8 \
diff --git a/data/jepsen/jepsen.patch b/data/jepsen/jepsen.patch
index 9caa05c32..96942fa9d 100644
--- a/data/jepsen/jepsen.patch
+++ b/data/jepsen/jepsen.patch
@@ -37,6 +37,19 @@ index 8b280e7..9e85e33 100644
                   [clj-http "3.13.1"]]
    :main jepsen.duckdb.cli
    :repl-options {:init-ns jepsen.duckdb.repl}
+diff --git a/src/jepsen/duckdb/cli.clj b/src/jepsen/duckdb/cli.clj
+index b5c493c..be4590d 100644
+--- a/src/jepsen/duckdb/cli.clj
++++ b/src/jepsen/duckdb/cli.clj
+@@ -107,7 +107,7 @@
+         env           {"JEPSEN_OPTS" (pr-str env-opts)}
+         primary-env   (assoc env "JEPSEN_RW_MODE" "rw")
+         secondary-env (assoc env "JEPSEN_RW_MODE" "ro")]
+-      (local/db {:bin "/usr/bin/java"
++      (local/db {:bin (str (System/getenv "JAVA_HOME") "/bin/java")
+                  :node-args (zipmap (:nodes opts) (repeat args))
+                  :node-envs (zipmap (:nodes opts)
+                                     (cons primary-env (repeat secondary-env)))})))
 diff --git a/src/jepsen/duckdb/client.clj b/src/jepsen/duckdb/client.clj
 index 718ec4c..3c6355f 100644
 --- a/src/jepsen/duckdb/client.clj