Skip to content

Fix Jepsen runs on CI (2.0) #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
staticlibs merged 1 commit into from
Oct 18, 2026
Merged

Fix Jepsen runs on CI (2.0) #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/Java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 \
Expand Down
13 changes: 13 additions & 0 deletions data/jepsen/jepsen.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading