Running dockerhub tests by default on CI

Author: fcostaoliveira

.github/workflows/tox-self-hosted.yml

@@ -83,7 +83,7 @@ def test_commit_schema_to_stream_then_build():
 
 def should_run_builder():
     run_builder = True
-    TST_BUILDER_X = os.getenv("TST_BUILDER_X", "1")
+    TST_BUILDER_X = os.getenv("TST_BUILDER_X", "0")
     if TST_BUILDER_X == "0":
         run_builder = False
     return run_builder

utils/tests/test_builder.py

@@ -258,7 +258,7 @@ def test_extract_testsuites():
         ]
     )
     tests = extract_testsuites(args)
-    assert len(tests) == 4
+    assert len(tests) == 6
 
     args = parser.parse_args(
         args=[
@@ -269,7 +269,7 @@ def test_extract_testsuites():
         ]
     )
     tests = extract_testsuites(args)
-    assert len(tests) == 4
+    assert len(tests) == 6
 
     args = parser.parse_args(
         args=[

utils/tests/test_runner.py

@@ -19,9 +19,7 @@
 from redis_benchmarks_specification.__self_contained_coordinator__.self_contained_coordinator import (
     self_contained_coordinator_blocking_read,
 )
-from redis_benchmarks_specification.__self_contained_coordinator__.clients import (
-    prepare_memtier_benchmark_parameters,
-)
+
 from redis_benchmarks_specification.__self_contained_coordinator__.runners import (
     build_runners_consumer_group_create,
     get_runners_consumer_group_name,
@@ -89,13 +87,17 @@ def test_generate_cpuset_cpus():
     assert db_cpuset_cpus == "2,3,4"
 
 
+def run_coordinator_tests():
+    run_coordinator = True
+    TST_RUNNER_X = os.getenv("TST_RUNNER_X", "0")
+    if TST_RUNNER_X == "0":
+        run_coordinator = False
+    return run_coordinator
+
+
 def test_self_contained_coordinator_blocking_read():
     try:
-        run_coordinator = True
-        TST_RUNNER_X = os.getenv("TST_RUNNER_X", "1")
-        if TST_RUNNER_X == "0":
-            run_coordinator = False
-        if run_coordinator:
+        if run_coordinator_tests():
             conn = redis.StrictRedis(port=6379)
             conn.ping()
             expected_datapoint_ts = None

utils/tests/test_self_contained_coordinator.py

@@ -35,11 +35,7 @@
 
 def test_self_contained_coordinator_blocking_read():
     try:
-        run_coordinator = True
-        TST_RUNNER_X = os.getenv("TST_RUNNER_X", "1")
-        if TST_RUNNER_X == "0":
-            run_coordinator = False
-        if run_coordinator:
+        if run_coordinator_tests():
             db_port = int(os.getenv("DATASINK_PORT", "6379"))
             conn = redis.StrictRedis(port=db_port)
             conn.ping()
@@ -210,13 +206,25 @@ def test_self_contained_coordinator_blocking_read():
         pass
 
 
+def run_coordinator_tests():
+    run_coordinator = True
+    TST_RUNNER_X = os.getenv("TST_RUNNER_X", "0")
+    if TST_RUNNER_X == "0":
+        run_coordinator = False
+    return run_coordinator
+
+
+def run_coordinator_tests_dockerhub():
+    run_coordinator = True
+    TST_RUNNER_X = os.getenv("TST_RUNNER_DOCKERHUB_X", "1")
+    if TST_RUNNER_X == "0":
+        run_coordinator = False
+    return run_coordinator
+
+
 def test_self_contained_coordinator_dockerhub():
     try:
-        run_coordinator = True
-        TST_RUNNER_X = os.getenv("TST_RUNNER_X", "1")
-        if TST_RUNNER_X == "0":
-            run_coordinator = False
-        if run_coordinator:
+        if run_coordinator_tests_dockerhub():
             db_port = int(os.getenv("DATASINK_PORT", "6379"))
             conn = redis.StrictRedis(port=db_port)
             conn.ping()
@@ -342,11 +350,7 @@ def test_self_contained_coordinator_dockerhub():
 
 def test_self_contained_coordinator_dockerhub_valkey():
     try:
-        run_coordinator = True
-        TST_RUNNER_X = os.getenv("TST_RUNNER_X", "1")
-        if TST_RUNNER_X == "0":
-            run_coordinator = False
-        if run_coordinator:
+        if run_coordinator_tests_dockerhub():
             db_port = int(os.getenv("DATASINK_PORT", "6379"))
             conn = redis.StrictRedis(port=db_port)
             conn.ping()
@@ -477,11 +481,7 @@ def test_self_contained_coordinator_dockerhub_valkey():
 
 def test_self_contained_coordinator_skip_build_variant():
     try:
-        run_coordinator = True
-        TST_RUNNER_X = os.getenv("TST_RUNNER_X", "1")
-        if TST_RUNNER_X == "0":
-            run_coordinator = False
-        if run_coordinator:
+        if run_coordinator_tests():
             db_port = int(os.getenv("DATASINK_PORT", "6379"))
             conn = redis.StrictRedis(port=db_port)
             conn.ping()