redisbench-admin 0.11.12__tar.gz → 0.11.13__tar.gz

{redisbench_admin-0.11.12 → redisbench_admin-0.11.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.12
+Version: 0.11.13
 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 → redisbench_admin-0.11.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.12"
+version = "0.11.13"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"

{redisbench_admin-0.11.12 → redisbench_admin-0.11.13}/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-0.11.12 → redisbench_admin-0.11.13}/redisbench_admin/compare/compare.py

@@ -166,7 +166,9 @@ 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
-    # using an access token
+    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
     regression_comment = None
@@ -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,7 +724,10 @@ 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
     table = []
@@ -738,6 +749,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 +759,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-0.11.12 → redisbench_admin-0.11.13}/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