Fixed scc memtier benchmarks

Author: fcostaoliveira

utils/tests/test_self_contained_coordinator_memtier.py

@@ -105,6 +105,8 @@ def test_self_contained_coordinator_blocking_read():
             assert number_processed_streams == 1
             test_name = "memtier_benchmark-1Mkeys-100B-expire-use-case"
             tf_triggering_env = "ci"
+            tf_github_org = "redis"
+            tf_github_repo = "redis"
             deployment_name = "oss-standalone"
             deployment_type = "oss-standalone"
             use_metric_context_path = False
@@ -711,7 +713,7 @@ def test_self_contained_coordinator_dockerhub_valkey():
             assert result == True
             assert number_processed_streams == 1
             assert num_process_test_suites == 1
-            by_version_key = f"ci.benchmarks.redislabs/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
+            by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
             assert datasink_conn.exists(by_version_key)
             rts = datasink_conn.ts()
             # check we have by version metrics
@@ -844,7 +846,7 @@ def test_dockerhub_via_cli():
         assert result == True
         assert number_processed_streams == 1
         assert num_process_test_suites == 1
-        by_version_key = f"ci.benchmarks.redislabs/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
+        by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
         assert datasink_conn.exists(by_version_key)
         rts = datasink_conn.ts()
         # check we have by version metrics
@@ -973,11 +975,13 @@ def test_dockerhub_via_cli_airgap():
         assert result == True
         assert number_processed_streams == 1
         assert num_process_test_suites == 1
-        by_version_key = f"ci.benchmarks.redislabs/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
+        by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
         assert datasink_conn.exists(by_version_key)
         rts = datasink_conn.ts()
         # check we have by version metrics
-        assert "version" in rts.info(by_version_key).labels
+        key_labels = rts.info(by_version_key).labels
+        logging.info(key_labels)
+        assert "version" in key_labels
         assert redis_version == rts.info(by_version_key).labels["version"]
 
         # get all keys
@@ -1077,7 +1081,7 @@ def test_prepare_memtier_benchmark_parameters():
         )
         assert (
             benchmark_command_str
-            == 'memtier_benchmark --json-out-file 1.json --port 12000 --server localhost "--data-size" "100" --command "SETEX __key__ 10 __data__" --command-key-pattern="R" --command "SET __key__ __data__" --command-key-pattern="R" --command "GET __key__" --command-key-pattern="R" --command "DEL __key__" --command-key-pattern="R"  -c 50 -t 2 --hide-histogram --test-time 300'
+            == 'memtier_benchmark --json-out-file 1.json --port 12000 --server localhost "--data-size" "100" --command "SETEX __key__ 10 __data__" --command-key-pattern="R" --command "SET __key__ __data__" --command-key-pattern="R" --command "GET __key__" --command-key-pattern="R" --command "DEL __key__" --command-key-pattern="R"  -c 50 -t 2 --hide-histogram --test-time 120 --key-minimum 1 --key-maximum 1000000'
         )
         oss_api_enabled = True
         (
@@ -1093,7 +1097,7 @@ def test_prepare_memtier_benchmark_parameters():
         )
         assert (
             benchmark_command_str
-            == 'memtier_benchmark --json-out-file 1.json --port 12000 --server localhost --cluster-mode "--data-size" "100" --command "SETEX __key__ 10 __data__" --command-key-pattern="R" --command "SET __key__ __data__" --command-key-pattern="R" --command "GET __key__" --command-key-pattern="R" --command "DEL __key__" --command-key-pattern="R"  -c 50 -t 2 --hide-histogram --test-time 300'
+            == 'memtier_benchmark --json-out-file 1.json --port 12000 --server localhost --cluster-mode "--data-size" "100" --command "SETEX __key__ 10 __data__" --command-key-pattern="R" --command "SET __key__ __data__" --command-key-pattern="R" --command "GET __key__" --command-key-pattern="R" --command "DEL __key__" --command-key-pattern="R"  -c 50 -t 2 --hide-histogram --test-time 120 --key-minimum 1 --key-maximum 1000000'
         )