Skip to content

Commit dec50a6

Browse files
Fixed ts prefix
1 parent 0c9e019 commit dec50a6

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

redis_benchmarks_specification/__common__/timeseries.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def get_ts_metric_name(
7676
else:
7777
deployment_name = ""
7878
ts_name = (
79-
"ci.benchmarks.redislabs/{by}/"
79+
"ci.benchmarks.redis/{by}/"
8080
"{triggering_env}/{github_org}/{github_repo}/"
8181
"{test_name}/{build_variant_str}{running_platform_str}{deployment_type}{deployment_name}/{by_value}/{metric}".format(
8282
by=by,
@@ -323,7 +323,7 @@ def from_metric_kv_to_timeserie(
323323
}
324324

325325
original_ts_name = ts_name
326-
target_table_keyname = "target_tables:{triggering_env}:ci.benchmarks.redislabs/{break_by_key}/{break_by_str}/{tf_github_org}/{tf_github_repo}/{deployment_type}/{deployment_name}/{test_name}/{metric_name}".format(
326+
target_table_keyname = "target_tables:{triggering_env}:ci.benchmarks.redis/{break_by_key}/{break_by_str}/{tf_github_org}/{tf_github_repo}/{deployment_type}/{deployment_name}/{test_name}/{metric_name}".format(
327327
triggering_env=tf_triggering_env,
328328
break_by_key=break_by_key,
329329
break_by_str=break_by_str,
@@ -679,7 +679,7 @@ def get_overall_dashboard_keynames(
679679
if running_platform is not None:
680680
running_platform_str = "/{}".format(running_platform)
681681
sprefix = (
682-
"ci.benchmarks.redislabs/"
682+
"ci.benchmarks.redis/"
683683
+ "{triggering_env}/{github_org}/{github_repo}".format(
684684
triggering_env=tf_triggering_env,
685685
github_org=tf_github_org,

redis_benchmarks_specification/__compare__/compare.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def get_overall_dashboard_keynames(
5959
if running_platform is not None:
6060
running_platform_str = "/{}".format(running_platform)
6161
sprefix = (
62-
"ci.benchmarks.redislabs/"
62+
"ci.benchmarks.redis/"
6363
+ "{triggering_env}/{github_org}/{github_repo}".format(
6464
triggering_env=tf_triggering_env,
6565
github_org=tf_github_org,
@@ -128,7 +128,7 @@ def get_start_time_vars(start_time=None):
128128

129129

130130
def get_project_compare_zsets(triggering_env, org, repo):
131-
return "ci.benchmarks.redislabs/{}/{}/{}:compare:pull_requests:zset".format(
131+
return "ci.benchmarks.redis/{}/{}/{}:compare:pull_requests:zset".format(
132132
triggering_env, org, repo
133133
)
134134

redis_benchmarks_specification/__self_contained_coordinator__/prepopulation.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ def data_prepopulation_step(
2323
port,
2424
temporary_dir,
2525
test_name,
26+
redis_password,
2627
):
2728
# setup the benchmark
2829
(
@@ -53,6 +54,7 @@ def data_prepopulation_step(
5354
"localhost",
5455
local_benchmark_output_filename,
5556
False,
57+
redis_password,
5658
)
5759

5860
logging.info(

redis_benchmarks_specification/__self_contained_coordinator__/runners.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ def process_self_contained_coordinator_stream(
345345
redis_proc_start_port,
346346
temporary_dir,
347347
test_name,
348+
redis_password,
348349
)
349350

350351
logging.info(

redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,10 +495,8 @@ def process_self_contained_coordinator_stream(
495495
docker_keep_env=False,
496496
restore_build_artifacts_default=True,
497497
args=None,
498+
redis_password="redis_coordinator_password_2024",
498499
):
499-
# Use a default password for coordinator Redis instances
500-
redis_password = "redis_coordinator_password_2024"
501-
502500
stream_id = "n/a"
503501
overall_result = False
504502
total_test_suite_runs = 0
@@ -936,6 +934,7 @@ def process_self_contained_coordinator_stream(
936934
redis_proc_start_port,
937935
temporary_dir,
938936
test_name,
937+
redis_password,
939938
)
940939

941940
execute_init_commands(
@@ -1700,6 +1699,7 @@ def data_prepopulation_step(
17001699
port,
17011700
temporary_dir,
17021701
test_name,
1702+
redis_password,
17031703
):
17041704
# setup the benchmark
17051705
(

utils/generate_latency_benchmarks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def main():
134134
return
135135

136136
# Key for test cases
137-
testcases_key = "ci.benchmarks.redislabs/ci/redis/redis:testcases"
137+
testcases_key = "ci.benchmarks.redis/ci/redis/redis:testcases"
138138

139139
# Retrieve test cases
140140
testcases = rts.smembers(testcases_key)
@@ -147,7 +147,7 @@ def main():
147147
for test_name in testcases:
148148
# Construct the time series key
149149
ts_key = (
150-
f"ci.benchmarks.redislabs/by.branch/ci/redis/redis/{test_name}/"
150+
f"ci.benchmarks.redis/by.branch/ci/redis/redis/{test_name}/"
151151
"gcc:8.5.0-amd64-debian-buster-default/"
152152
"intel64-ubuntu22.04-redis-icx1/oss-standalone/unstable/"
153153
"ALL_STATS.Totals.Ops/sec"

0 commit comments

Comments
 (0)