From 8eb2c261770a5ed75f2d8857fddf8418edac31ce Mon Sep 17 00:00:00 2001 From: Dmitry Sherstobitov Date: Tue, 9 Jan 2024 15:16:08 +0400 Subject: [PATCH 1/2] Enabled GEO tests again --- yugabyte/run-jepsen.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/yugabyte/run-jepsen.py b/yugabyte/run-jepsen.py index 132147146..503a48452 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", ] } ] @@ -258,6 +258,8 @@ def send_report_to_reportportal( logging.error(f"Code: {response.status_code} Text: {response.text}") return False + return True + def run_cmd(cmd, timeout=None, From 8d4f5f043345f3bc6a5982e8087ae079f5c515e2 Mon Sep 17 00:00:00 2001 From: Dmitry Sherstobitov Date: Fri, 16 Feb 2024 11:00:40 +0400 Subject: [PATCH 2/2] Fixed return code --- yugabyte/run-jepsen.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/yugabyte/run-jepsen.py b/yugabyte/run-jepsen.py index 503a48452..0171b52f8 100755 --- a/yugabyte/run-jepsen.py +++ b/yugabyte/run-jepsen.py @@ -251,13 +251,12 @@ 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 @@ -436,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: