Fixed builder process

Author: filipecosta90

redis_benchmarks_specification/__builder__/builder.py

@@ -246,8 +246,7 @@ def builder_process_stream(builders_folder, conn, different_build_specs, previou
                     deps_list.append("hdr_histogram")
                 redis_temporary_dir = temporary_dir + "/" + redis_dir + "/"
                 logging.info("Using redis temporary dir {}".format(redis_temporary_dir))
-                build_command = 'bash -c "make Makefile.dep {} && cd ./deps && CXX={} CC={} make {} {} -j && cd .. && CXX={} CC={} make {} {} -j"'.format(
-                    build_vars_str,
+                build_command = "bash -c 'make Makefile.dep && cd ./deps && CXX={} CC={} make {} {} -j && cd .. && CXX={} CC={} make {} {} -j'".format(
                     cpp_compiler,
                     compiler,
                     " ".join(deps_list),

redis_benchmarks_specification/setups/builders/icc-2021.3.0-amd64-ubuntu18.04-libc.yml

@@ -17,4 +17,4 @@ metadata:
 
 env:
   MALLOC: "libc"
-
+  REDIS_CFLAGS: "-g -fno-omit-frame-pointer"

utils/tests/test_data/dump.rdb

@@ -110,7 +110,8 @@ def test_self_contained_coordinator_blocking_read():
             running_platform = "fco-ThinkPad-T490"
 
             build_runners_consumer_group_create(conn, running_platform, "0")
-            rts = redis.StrictRedis(port=16379).ts()
+            datasink_conn = redis.StrictRedis(port=16379)
+            rts = datasink_conn.ts()
             docker_client = docker.from_env()
             home = str(Path.home())
             stream_id = ">"
@@ -133,7 +134,7 @@ def test_self_contained_coordinator_blocking_read():
                 docker_client,
                 home,
                 stream_id,
-                rts,
+                datasink_conn,
                 testsuite_spec_files,
                 topologies_map,
                 running_platform,
@@ -183,6 +184,7 @@ def test_self_contained_coordinator_blocking_read():
             (
                 prefix,
                 testcases_setname,
+                deployment_name_setname,
                 tsname_project_total_failures,
                 tsname_project_total_success,
                 running_platforms_setname,
@@ -203,52 +205,56 @@ def test_self_contained_coordinator_blocking_read():
                 test_name,
             )
 
-            assert rts.redis.exists(testcases_setname)
-            assert rts.redis.exists(running_platforms_setname)
-            assert rts.redis.exists(build_variant_setname)
-            assert rts.redis.exists(testcases_and_metric_context_path_setname)
-            assert rts.redis.exists(testcases_metric_context_path_setname)
-            assert build_variant_name.encode() in rts.redis.smembers(
+            assert datasink_conn.exists(testcases_setname)
+            assert datasink_conn.exists(running_platforms_setname)
+            assert datasink_conn.exists(build_variant_setname)
+            assert datasink_conn.exists(testcases_and_metric_context_path_setname)
+            assert datasink_conn.exists(testcases_metric_context_path_setname)
+            assert build_variant_name.encode() in datasink_conn.smembers(
                 build_variant_setname
             )
-            assert test_name.encode() in rts.redis.smembers(testcases_setname)
-            assert running_platform.encode() in rts.redis.smembers(
+            assert test_name.encode() in datasink_conn.smembers(testcases_setname)
+            assert running_platform.encode() in datasink_conn.smembers(
                 running_platforms_setname
             )
             testcases_and_metric_context_path_members = [
                 x.decode()
-                for x in rts.redis.smembers(testcases_and_metric_context_path_setname)
+                for x in datasink_conn.smembers(
+                    testcases_and_metric_context_path_setname
+                )
             ]
             metric_context_path_members = [
                 x.decode()
-                for x in rts.redis.smembers(testcases_metric_context_path_setname)
+                for x in datasink_conn.smembers(testcases_metric_context_path_setname)
             ]
             assert len(testcases_and_metric_context_path_members) == len(
                 metric_context_path_members
             )
 
-            assert [x.decode() for x in rts.redis.smembers(testcases_setname)] == [
+            assert [x.decode() for x in datasink_conn.smembers(testcases_setname)] == [
                 test_name
             ]
 
-            assert "amd64".encode() in rts.redis.smembers(project_archs_setname)
-            assert "debian-buster".encode() in rts.redis.smembers(project_oss_setname)
-            assert "gcc".encode() in rts.redis.smembers(project_compilers_setname)
-            assert build_variant_name.encode() in rts.redis.smembers(
+            assert "amd64".encode() in datasink_conn.smembers(project_archs_setname)
+            assert "debian-buster".encode() in datasink_conn.smembers(
+                project_oss_setname
+            )
+            assert "gcc".encode() in datasink_conn.smembers(project_compilers_setname)
+            assert build_variant_name.encode() in datasink_conn.smembers(
                 build_variant_setname
             )
-            assert running_platform.encode() in rts.redis.smembers(
+            assert running_platform.encode() in datasink_conn.smembers(
                 running_platforms_setname
             )
 
-            assert len(rts.redis.smembers(project_archs_setname)) == 1
-            assert len(rts.redis.smembers(project_oss_setname)) == 1
-            assert len(rts.redis.smembers(project_compilers_setname)) == 1
-            assert len(rts.redis.smembers(build_variant_setname)) == 1
-            assert len(rts.redis.smembers(running_platforms_setname)) == 1
-            assert len(rts.redis.smembers(testcases_setname)) == 1
-            assert len(rts.redis.smembers(project_branches_setname)) == 1
-            assert len(rts.redis.smembers(project_versions_setname)) == 0
+            assert len(datasink_conn.smembers(project_archs_setname)) == 1
+            assert len(datasink_conn.smembers(project_oss_setname)) == 1
+            assert len(datasink_conn.smembers(project_compilers_setname)) == 1
+            assert len(datasink_conn.smembers(build_variant_setname)) == 1
+            assert len(datasink_conn.smembers(running_platforms_setname)) == 1
+            assert len(datasink_conn.smembers(testcases_setname)) == 1
+            assert len(datasink_conn.smembers(project_branches_setname)) == 1
+            assert len(datasink_conn.smembers(project_versions_setname)) == 0
             # ensure we don't change state on the rdb
             conn.execute_command("DEBUG", "RELOAD", "NOSAVE")
 

utils/tests/test_self_contained_coordinator.py

@@ -51,7 +51,7 @@ def test_self_contained_coordinator_blocking_read():
             running_platform = "fco-ThinkPad-T490"
 
             build_runners_consumer_group_create(conn, running_platform, "0")
-            rts = redis.StrictRedis(port=16379).ts()
+            datasink_conn = redis.StrictRedis(port=16379)
             docker_client = docker.from_env()
             home = str(Path.home())
             stream_id = ">"
@@ -74,7 +74,7 @@ def test_self_contained_coordinator_blocking_read():
                 docker_client,
                 home,
                 stream_id,
-                rts,
+                datasink_conn,
                 testsuite_spec_files,
                 topologies_map,
                 running_platform,
@@ -107,14 +107,15 @@ def test_self_contained_coordinator_blocking_read():
                     build_variant_name,
                     running_platform,
                 )
-
+                rts = datasink_conn.ts()
                 assert ts_key_name.encode() in conn.keys()
                 assert len(rts.range(ts_key_name, 0, -1)) == 1
                 if expected_datapoint_ts is not None:
                     assert rts.range(ts_key_name, 0, -1)[0][0] == expected_datapoint_ts
             (
                 prefix,
                 testcases_setname,
+                deployment_name_setname,
                 tsname_project_total_failures,
                 tsname_project_total_success,
                 running_platforms_setname,
@@ -135,52 +136,56 @@ def test_self_contained_coordinator_blocking_read():
                 test_name,
             )
 
-            assert rts.redis.exists(testcases_setname)
-            assert rts.redis.exists(running_platforms_setname)
-            assert rts.redis.exists(build_variant_setname)
-            assert rts.redis.exists(testcases_and_metric_context_path_setname)
-            assert rts.redis.exists(testcases_metric_context_path_setname)
-            assert build_variant_name.encode() in rts.redis.smembers(
+            assert datasink_conn.exists(testcases_setname)
+            assert datasink_conn.exists(running_platforms_setname)
+            assert datasink_conn.exists(build_variant_setname)
+            assert datasink_conn.exists(testcases_and_metric_context_path_setname)
+            assert datasink_conn.exists(testcases_metric_context_path_setname)
+            assert build_variant_name.encode() in datasink_conn.smembers(
                 build_variant_setname
             )
-            assert test_name.encode() in rts.redis.smembers(testcases_setname)
-            assert running_platform.encode() in rts.redis.smembers(
+            assert test_name.encode() in datasink_conn.smembers(testcases_setname)
+            assert running_platform.encode() in datasink_conn.smembers(
                 running_platforms_setname
             )
             testcases_and_metric_context_path_members = [
                 x.decode()
-                for x in rts.redis.smembers(testcases_and_metric_context_path_setname)
+                for x in datasink_conn.smembers(
+                    testcases_and_metric_context_path_setname
+                )
             ]
             metric_context_path_members = [
                 x.decode()
-                for x in rts.redis.smembers(testcases_metric_context_path_setname)
+                for x in datasink_conn.smembers(testcases_metric_context_path_setname)
             ]
             assert len(testcases_and_metric_context_path_members) == len(
                 metric_context_path_members
             )
 
-            assert [x.decode() for x in rts.redis.smembers(testcases_setname)] == [
+            assert [x.decode() for x in datasink_conn.smembers(testcases_setname)] == [
                 test_name
             ]
 
-            assert "amd64".encode() in rts.redis.smembers(project_archs_setname)
-            assert "debian-buster".encode() in rts.redis.smembers(project_oss_setname)
-            assert "gcc".encode() in rts.redis.smembers(project_compilers_setname)
-            assert build_variant_name.encode() in rts.redis.smembers(
+            assert "amd64".encode() in datasink_conn.smembers(project_archs_setname)
+            assert "debian-buster".encode() in datasink_conn.smembers(
+                project_oss_setname
+            )
+            assert "gcc".encode() in datasink_conn.smembers(project_compilers_setname)
+            assert build_variant_name.encode() in datasink_conn.smembers(
                 build_variant_setname
             )
-            assert running_platform.encode() in rts.redis.smembers(
+            assert running_platform.encode() in datasink_conn.smembers(
                 running_platforms_setname
             )
 
-            assert len(rts.redis.smembers(project_archs_setname)) == 1
-            assert len(rts.redis.smembers(project_oss_setname)) == 1
-            assert len(rts.redis.smembers(project_compilers_setname)) == 1
-            assert len(rts.redis.smembers(build_variant_setname)) == 1
-            assert len(rts.redis.smembers(running_platforms_setname)) == 1
-            assert len(rts.redis.smembers(testcases_setname)) == 1
-            assert len(rts.redis.smembers(project_branches_setname)) == 1
-            assert len(rts.redis.smembers(project_versions_setname)) == 0
+            assert len(datasink_conn.smembers(project_archs_setname)) == 1
+            assert len(datasink_conn.smembers(project_oss_setname)) == 1
+            assert len(datasink_conn.smembers(project_compilers_setname)) == 1
+            assert len(datasink_conn.smembers(build_variant_setname)) == 1
+            assert len(datasink_conn.smembers(running_platforms_setname)) == 1
+            assert len(datasink_conn.smembers(testcases_setname)) == 1
+            assert len(datasink_conn.smembers(project_branches_setname)) == 1
+            assert len(datasink_conn.smembers(project_versions_setname)) == 0
 
     except redis.exceptions.ConnectionError:
         pass
@@ -213,7 +218,7 @@ def test_self_contained_coordinator_skip_build_variant():
             running_platform = "fco-ThinkPad-T490"
 
             build_runners_consumer_group_create(conn, running_platform, "0")
-            rts = redis.StrictRedis(port=16379).ts()
+            datasink_conn = redis.StrictRedis(port=16379)
             docker_client = docker.from_env()
             home = str(Path.home())
             stream_id = ">"
@@ -236,7 +241,7 @@ def test_self_contained_coordinator_skip_build_variant():
                 docker_client,
                 home,
                 stream_id,
-                rts,
+                datasink_conn,
                 testsuite_spec_files,
                 topologies_map,
                 running_platform,