From a8d5375b7f562a58be31f1048da4bc2dff1e632e Mon Sep 17 00:00:00 2001 From: Raunak Jalan <118164396+rjalan-yb@users.noreply.github.com> Date: Fri, 16 Feb 2024 09:33:11 +0530 Subject: [PATCH 1/2] YQ-1489 Upgrading Jepsen to 0.3.4 (#113) * YQ-1489 Upgrading clojure version to 0.3.5 * YQ-1489 Upgrading clojure version to 0.3.5 * YQ-1489 Upgrading clojure version to 0.3.5 * YQ-1489 Upgrading clojure version to 0.3.5 * YQ-1489 Upgrading clojure version to 0.3.4 --- yugabyte/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yugabyte/project.clj b/yugabyte/project.clj index a5e36cb99..9b9ea0165 100644 --- a/yugabyte/project.clj +++ b/yugabyte/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [[org.clojure/clojure "1.11.1"] [clj-http "3.12.3" :exclusions [commons-logging]] - [jepsen "0.3.3"] + [jepsen "0.3.4"] [com.yugabyte/cassaforte "3.0.0-alpha2-yb-1"] [org.clojure/java.jdbc "0.7.12"] [org.clojure/data.json "2.4.0"] From 1ffec118bbdb9163a5907095c4aeedd086d873ee Mon Sep 17 00:00:00 2001 From: Dmitrii Sherstobitov Date: Fri, 16 Feb 2024 11:27:28 +0400 Subject: [PATCH 2/2] Enabled GEO tests after fix (#111) --- yugabyte/run-jepsen.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/yugabyte/run-jepsen.py b/yugabyte/run-jepsen.py index 132147146..0171b52f8 100755 --- a/yugabyte/run-jepsen.py +++ b/yugabyte/run-jepsen.py @@ -81,11 +81,11 @@ "ysql/sz.multi-key-acid", "ysql/sz.default-value", "ysql/sz.ol.append", - # "ysql/sz.ol.geo.append", + "ysql/sz.ol.geo.append", # YSQL snapshot isolation "ysql/si.ol.append", - # "ysql/si.ol.geo.append", + "ysql/si.ol.geo.append", "ysql/si.bank", "ysql/si.bank-contention", "ysql/si.bank-multitable", @@ -96,23 +96,23 @@ "tests": [ # YSQL read committed "ysql/rc.ol.append", - # "ysql/rc.ol.geo.append", + "ysql/rc.ol.geo.append", ] }, { "start_version": "2.15.0.0-b1", "tests": [ "ysql/rc.pl.append", - # "ysql/rc.pl.geo.append", + "ysql/rc.pl.geo.append", ] }, { "start_version": "2.17.2.0-b1", "tests": [ "ysql/sz.pl.append", - # "ysql/sz.pl.geo.append", + "ysql/sz.pl.geo.append", "ysql/si.pl.append", - # "ysql/si.pl.geo.append", + "ysql/si.pl.geo.append", ] } ] @@ -251,13 +251,14 @@ def send_report_to_reportportal( headers={"accept": "*/*", "Content-Type": "application/json", "Authorization": f"bearer {reportportal_api_token}"}) - if response.status_code == 200: - logging.info(f"Successfully updated attributes for launch {launch_id}") - else: + if response.status_code != 200: logging.error(f"Could not update attributes for launch {launch_id}") logging.error(f"Code: {response.status_code} Text: {response.text}") return False + logging.info(f"Successfully updated attributes for launch {launch_id}") + return True + def run_cmd(cmd, timeout=None, @@ -434,7 +435,7 @@ def main(): "--os debian", f"--url {url}", f"--nemesis {nemeses}", - f"--ssh-private-key ~/.ssh/id_rsa", # tmp workaround for jepsen 0.2.7+ versions + f"--ssh-private-key ~/.ssh/id_rsa", # tmp workaround for jepsen 0.2.7+ versions f"--concurrency {args.concurrency}"]) if args.iterations: