From ad2b926248a4fd464f6f278045c9103a75d92ca7 Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 6 Jun 2023 07:17:30 +0000
Subject: [PATCH] Fix jepsen runs in PRs

---
 tests/ci/jepsen_check.py                            | 8 ++------
 tests/jepsen.clickhouse/resources/keeper_config.xml | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/tests/ci/jepsen_check.py b/tests/ci/jepsen_check.py
index 9d35d2d6e35..c21fafa2605 100644
--- a/tests/ci/jepsen_check.py
+++ b/tests/ci/jepsen_check.py
@@ -25,6 +25,7 @@ from stopwatch import Stopwatch
 from tee_popen import TeePopen
 from upload_result_helper import upload_results
 from version_helper import get_version_from_repo
+from build_check import get_release_or_pr
 
 JEPSEN_GROUP_NAME = "jepsen_group"
 
@@ -210,12 +211,7 @@ if __name__ == "__main__":
 
     build_name = get_build_name_for_check(check_name)
 
-    if pr_info.number == 0:
-        version = get_version_from_repo()
-        release_or_pr = f"{version.major}.{version.minor}"
-    else:
-        # PR number for anything else
-        release_or_pr = str(pr_info.number)
+    release_or_pr, _ = get_release_or_pr(pr_info, get_version_from_repo())
 
     # This check run separately from other checks because it requires exclusive
     # run (see .github/workflows/jepsen.yml) So we cannot add explicit
diff --git a/tests/jepsen.clickhouse/resources/keeper_config.xml b/tests/jepsen.clickhouse/resources/keeper_config.xml
index 52f2a0dbdc2..1972ef6b917 100644
--- a/tests/jepsen.clickhouse/resources/keeper_config.xml
+++ b/tests/jepsen.clickhouse/resources/keeper_config.xml
@@ -13,19 +13,19 @@
         <disks>
             <log_local>
                 <type>local</type>
-                <path>/var/lib/clickhouse/coordination/logs/</path>
+                <path>/home/robot-clickhouse/db/coordination/logs/</path>
             </log_local>
             <latest_log_local>
                 <type>local</type>
-                <path>/var/lib/clickhouse/coordination/latest_log/</path>
+                <path>/home/robot-clickhouse/db/coordination/latest_log/</path>
             </latest_log_local>
             <snapshot_local>
                 <type>local</type>
-                <path>/var/lib/clickhouse/coordination/snapshots/</path>
+                <path>/home/robot-clickhouse/db/coordination/snapshots/</path>
             </snapshot_local>
             <latest_snapshot_local>
                 <type>local</type>
-                <path>/var/lib/clickhouse/coordination/latest_snapshot/</path>
+                <path>/home/robot-clickhouse/db/coordination/latest_snapshot/</path>
             </latest_snapshot_local>
         </disks>
     </storage_configuration>