redisbench-admin 0.11.12__py3-none-any.whl → 0.11.14__py3-none-any.whl

redisbench_admin/compare/args.py

@@ -53,6 +53,8 @@ def create_compare_arguments(parser):
     parser.add_argument("--deployment_type", type=str, default="oss-standalone")
     parser.add_argument("--baseline_deployment_name", type=str, default="")
     parser.add_argument("--comparison_deployment_name", type=str, default="")
+    parser.add_argument("--baseline_github_org", type=str, default=GITHUB_ORG)
+    parser.add_argument("--comparison_github_org", type=str, default=GITHUB_ORG)
     parser.add_argument("--metric_name", type=str, default=None)
     parser.add_argument("--running_platform", type=str, default=None)
     parser.add_argument("--extra-filter", type=str, default=None)

redisbench_admin/compare/compare.py

@@ -166,6 +166,8 @@ def compare_command_logic(args, project_name, project_version):
     auto_approve = args.auto_approve
     running_platform = args.running_platform
     grafana_base_dashboard = args.grafana_base_dashboard
+    baseline_github_org = args.baseline_github_org
+    comparison_github_org = args.comparison_github_org
     # using an access token
     is_actionable_pr = False
     contains_regression_comment = False
@@ -280,6 +282,8 @@ def compare_command_logic(args, project_name, project_version):
         to_ts_ms,
         use_metric_context_path,
         running_platform,
+        baseline_github_org,
+        comparison_github_org,
     )
     comment_body = ""
     if total_comparison_points > 0:
@@ -504,6 +508,8 @@ def compute_regression_table(
     to_ts_ms=None,
     use_metric_context_path=None,
     running_platform=None,
+    baseline_github_org="",
+    comparison_github_org="",
 ):
     START_TIME_NOW_UTC, _, _ = get_start_time_vars()
     START_TIME_LAST_MONTH_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=31)
@@ -589,6 +595,8 @@ def compute_regression_table(
         test_names,
         tf_triggering_env,
         verbose,
+        baseline_github_org,
+        comparison_github_org,
         running_platform,
     )
     logging.info(
@@ -716,6 +724,8 @@ def from_rts_to_regression_table(
     test_names,
     tf_triggering_env,
     verbose,
+    baseline_github_org="",
+    comparison_github_org="",
     running_platform=None,
 ):
     print_all = print_regressions_only is False and print_improvements_only is False
@@ -738,6 +748,7 @@ def from_rts_to_regression_table(
             "{}={}".format(test_filter, test_name),
             "deployment_name={}".format(baseline_deployment_name),
             "triggering_env={}".format(tf_triggering_env),
+            "github_org={}".format(baseline_github_org),
         ]
         if running_platform is not None:
             filters_baseline.append("running_platform={}".format(running_platform))
@@ -747,6 +758,7 @@ def from_rts_to_regression_table(
             "{}={}".format(test_filter, test_name),
             "deployment_name={}".format(comparison_deployment_name),
             "triggering_env={}".format(tf_triggering_env),
+            "github_org={}".format(comparison_github_org),
         ]
         if running_platform is not None:
             filters_comparison.append("running_platform={}".format(running_platform))

redisbench_admin/deploy/deploy.py

@@ -69,7 +69,9 @@ def deploy_command_logic(args, project_name, project_version):
     )
     tf_setup_name_sufix = "{}-{}".format(args.setup_name_sufix, tf_github_sha)
     tf_setup_name = "{}{}".format(remote_setup, tf_setup_name_sufix)
-    terraform_backend_key = "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name)
+    terraform_backend_key = "benchmarks/infrastructure/{}.tfstate".format(
+        tf_setup_name
+    ).replace("/", "-")
     tf_triggering_env = "redisbench-admin-deploy"
     logging.info("Setting an infra timeout of {} secs".format(infra_timeout_secs))
     if args.destroy is False:
@@ -101,6 +103,7 @@ def deploy_command_logic(args, project_name, project_version):
         _, _, _ = tf.init(
             capture_output=True,
             backend_config={"key": terraform_backend_key},
+            reconfigure=True,
         )
         logging.info("Refreshing remote state")
         _, _, _ = tf.refresh()

redisbench_admin/utils/remote.py

@@ -272,7 +272,9 @@ def setup_remote_environment(
     _, _, _ = tf.init(
         capture_output=True,
         backend_config={
-            "key": "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name)
+            "key": "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name).replace(
+                "/", "-"
+            )
         },
     )
     _, _, _ = tf.refresh()

redisbench_admin/watchdog/watchdog.py

@@ -31,14 +31,15 @@ def get_ci_ec2_instances_by_state(ec2_client, ci_machines_prefix, requested_stat
         instances = group["Instances"]
         for instance in instances:
             state = instance["State"]["Name"]
-            for tag_dict in instance["Tags"]:
-                key = tag_dict["Key"]
-                key_v = tag_dict["Value"]
-                if key == "Name":
-                    if ci_machines_prefix in key_v:
-                        if state == requested_state:
-                            count = count + 1
-                            state_instances.append(instance)
+            if "Tags" in instance:
+                for tag_dict in instance["Tags"]:
+                    key = tag_dict["Key"]
+                    key_v = tag_dict["Value"]
+                    if key == "Name":
+                        if ci_machines_prefix in key_v:
+                            if state == requested_state:
+                                count = count + 1
+                                state_instances.append(instance)
     return count, state_instances
 
 

{redisbench_admin-0.11.12.dist-info → redisbench_admin-0.11.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.12
+Version: 0.11.14
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redisbench_admin-0.11.12.dist-info → redisbench_admin-0.11.14.dist-info}/RECORD

@@ -3,11 +3,11 @@ redisbench_admin/cli.py,sha256=LAS5qnqScXKhxHYfXWB0mvAYaUYrSurIwadhexEa9g4,7740
 redisbench_admin/commands/__init__.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/commands/commands.json.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/compare/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/compare/args.py,sha256=10zbiT8roeTGnAubvoVFZTbJNbVxuRaRPtCKjxV8iNE,5226
-redisbench_admin/compare/compare.py,sha256=HOYLu8I0fi3ZGRD-uc5T1AyUr5WSHx3yt-Bs6o8dvRU,38025
+redisbench_admin/compare/args.py,sha256=S6QFNQEY68Fm_2eQZzfpKetuJlSOnhzFm9koReq423c,5386
+redisbench_admin/compare/compare.py,sha256=zxZzMfLJqYaVogQnHm2cOsROg7VlE5g2majRfFO_hss,38483
 redisbench_admin/deploy/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/deploy/args.py,sha256=neLUcQqI__HkJItkQg2C293hl5g3yHG40t171r7-E5Y,1732
-redisbench_admin/deploy/deploy.py,sha256=c1srxDMaUHuyh6wGdgLqzTz3ljZFtGqiumtAmguVyuk,3791
+redisbench_admin/deploy/deploy.py,sha256=l0yfWMYSGtcjcQes8t3i8-buO-jpEbzNJEU4Ik6FXC0,3853
 redisbench_admin/environments/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/environments/oss_cluster.py,sha256=lUOG6oN8VXAnDXFK7Xns-ag-hSOSxxxL8jZ4Mh03hQY,6681
 redisbench_admin/environments/oss_standalone.py,sha256=Sl38rUpwJ3wNOl9zn38iK8q2iJi2pRFmaJAZJbuT_SQ,2474
@@ -228,15 +228,15 @@ redisbench_admin/utils/benchmark_config.py,sha256=sVhS2c3p4lBMga0g3U-S9rF8pntcI4
 redisbench_admin/utils/local.py,sha256=zUvyVI9LZMT3qyxs1pO3mXL6Bt_1z9EZUGppaRcWNRA,3890
 redisbench_admin/utils/redisearch.py,sha256=lchUEzpt0zB1rHwlDlw9LLifAnxFWcLP-PePw7TjL-0,1602
 redisbench_admin/utils/redisgraph_benchmark_go.py,sha256=os7EJt6kBxsFJLKkSoANbjMT7-cEq4-Ns-49alk2Tf8,2048
-redisbench_admin/utils/remote.py,sha256=Z58WKPST-H9Osbn6_UUXWHk6ruIvZUyft5xYLAh5xtA,39367
+redisbench_admin/utils/remote.py,sha256=ajZ8bCL5pi8ILcWGSomOvZK8H8Uh7QHVWkdE6F77f5o,39415
 redisbench_admin/utils/results.py,sha256=uKk3uNJ--bSXlUj_HGQ2OaV6MVqmXJVM8xTzFV6EOw4,3267
 redisbench_admin/utils/ssh.py,sha256=QW4AwlocMHJt05QMdN_4f8WeDmxiEwR80ny8VBThq6k,6533
 redisbench_admin/utils/utils.py,sha256=nQkN3N2iVhoe2GlRxU3BBaicrtw5vZXFaqnstc4i2Fc,14034
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
-redisbench_admin/watchdog/watchdog.py,sha256=jFGtm5ktjKuXKWvH7lnmf3pp-ch1WBJUOomXILJMDAg,6158
-redisbench_admin-0.11.12.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.12.dist-info/METADATA,sha256=IVQoud26UHxgcf7hr7NjFIj0mp-xqXuEFFQhOx4dxhE,5438
-redisbench_admin-0.11.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.12.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.12.dist-info/RECORD,,
+redisbench_admin/watchdog/watchdog.py,sha256=NiveQyTq22ZCrZoPJYskP9s5MMLRXq9xCGdBwEMNMxg,6225
+redisbench_admin-0.11.14.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.14.dist-info/METADATA,sha256=CDyMvMYyAnvc06pLIQ3MCP1N7g98ONcrJuLePIrwQlQ,5438
+redisbench_admin-0.11.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.14.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.14.dist-info/RECORD,,