WIP on PR githubupdate builder/runner

Author: fcostaoliveira

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redis-benchmarks-specification"
-version = "0.1.76"
+version = "0.1.80"
 description = "The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "Readme.md"

redis_benchmarks_specification/__api__/app.py

@@ -86,11 +86,13 @@ def base():
             event_type = "Ignored event from webhook"
             use_event = False
             # Pull request labeled
+            pull_request_number = None
             trigger_label = PULL_REQUEST_TRIGGER_LABEL
             if "pull_request" in request_data:
                 action = request_data["action"]
                 if should_action(action):
                     pull_request_dict = request_data["pull_request"]
+
                     head_dict = pull_request_dict["head"]
                     repo_dict = head_dict["repo"]
                     labels = []
@@ -107,9 +109,8 @@ def base():
                         label_name = label["name"]
                         if trigger_label == label_name:
                             use_event = True
-                            event_type = "Pull request labeled with '{}'".format(
-                                trigger_label
-                            )
+                            pull_request_number = request_data["number"]
+                            event_type = f"Pull request #{pull_request_number} labeled with '{trigger_label}'"
                             detected_label = True
                     if detected_label is False:
                         app.logger.info(
@@ -161,6 +162,8 @@ def base():
                     "gh_repo": gh_repo,
                     "gh_org": gh_org,
                 }
+                if pull_request_number is not None:
+                    fields_after["pull_request_number"] = pull_request_number
                 app.logger.info(
                     "Using event {} to trigger benchmark. final fields: {}".format(
                         event_type, fields_after
@@ -174,7 +177,6 @@ def base():
                         event_type, response_data
                     )
                 )
-
             else:
                 app.logger.info(
                     "{}. input json was: {}".format(event_type, request_data)

redis_benchmarks_specification/__builder__/builder.py

@@ -31,11 +31,19 @@
     REDIS_SOCKET_TIMEOUT,
     REDIS_BINS_EXPIRE_SECS,
 )
+from redis_benchmarks_specification.__common__.github import (
+    check_github_available_and_actionable,
+    generate_build_finished_pr_comment,
+    update_comment_if_needed,
+    create_new_pr_comment,
+)
 from redis_benchmarks_specification.__common__.package import (
     populate_with_poetry_data,
     get_version_string,
 )
 
+PERFORMANCE_GH_TOKEN = os.getenv("PERFORMANCE_GH_TOKEN", None)
+
 
 class ZipFileWithPermissions(ZipFile):
     def _extract_member(self, member, targetpath, pwd):
@@ -80,6 +88,8 @@ def main():
         action="store_true",
         help="Store the docker images in redis keys.",
     )
+    parser.add_argument("--github_token", type=str, default=PERFORMANCE_GH_TOKEN)
+    parser.add_argument("--pull-request", type=str, default=None, nargs="?", const="")
     args = parser.parse_args()
     if args.logname is not None:
         print("Writting log to {}".format(args.logname))
@@ -138,7 +148,8 @@ def main():
     build_spec_image_prefetch(builders_folder, different_build_specs)
 
     builder_consumer_group_create(conn)
-
+    if args.github_token is not None:
+        logging.info("detected a github token. will update as much as possible!!! =)")
     previous_id = args.consumer_start_id
     while True:
         previous_id, new_builds_count, _ = builder_process_stream(
@@ -148,6 +159,7 @@ def main():
             previous_id,
             args.docker_air_gap,
             arch,
+            args.github_token,
         )
 
 
@@ -172,15 +184,28 @@ def builder_consumer_group_create(conn, id="$"):
         )
 
 
+def check_benchmark_build_comment(comments):
+    res = False
+    pos = -1
+    for n, comment in enumerate(comments):
+        body = comment.body
+        if "CE Performance Automation : step 1 of 2" in body:
+            res = True
+            pos = n
+    return res, pos
+
+
 def builder_process_stream(
     builders_folder,
     conn,
     different_build_specs,
     previous_id,
     docker_air_gap=False,
     arch="amd64",
+    github_token=None,
 ):
     new_builds_count = 0
+    auto_approve_github_comments = True
     build_stream_fields_arr = []
     logging.info("Entering blocking read waiting for work.")
     consumer_name = "{}-proc#{}".format(STREAM_GH_EVENTS_COMMIT_BUILDERS_CG, "1")
@@ -197,7 +222,6 @@ def builder_process_stream(
     else:
         streamId, testDetails = newTestInfo[0][1][0]
         logging.info("Received work . Stream id {}.".format(streamId))
-        conn.lpush("benchmarks:{streamId}")
         # commit = None
         # commited_date = ""
         # tag = ""
@@ -217,6 +241,12 @@ def builder_process_stream(
             buffer = conn.get(binary_zip_key)
             git_timestamp_ms = None
             use_git_timestamp = False
+            commit_datetime = "n/a"
+            if b"commit_datetime" in testDetails:
+                commit_datetime = int(testDetails[b"commit_datetime"].decode())
+            commit_summary = "n/a"
+            if b"commit_summary" in testDetails:
+                commit_summary = int(testDetails[b"commit_summary"].decode())
             git_branch, git_version = get_branch_version_from_test_details(testDetails)
             if b"use_git_timestamp" in testDetails:
                 use_git_timestamp = bool(testDetails[b"use_git_timestamp"])
@@ -239,6 +269,30 @@ def builder_process_stream(
             if b"tests_groups_regexp" in testDetails:
                 tests_groups_regexp = testDetails[b"tests_groups_regexp"].decode()
 
+            # github updates
+            is_actionable_pr = False
+            contains_regression_comment = False
+            github_pr = None
+            old_regression_comment_body = ""
+            pr_link = ""
+            regression_comment = ""
+            pull_request = None
+            if b"pull_request" in testDetails:
+                pull_request = testDetails[b"pull_request"].decode()
+                logging.info(f"Detected PR info in builder. PR: {pull_request}")
+                verbose = True
+
+                fn = check_benchmark_build_comment
+                (
+                    contains_regression_comment,
+                    github_pr,
+                    is_actionable_pr,
+                    old_regression_comment_body,
+                    pr_link,
+                    regression_comment,
+                ) = check_github_available_and_actionable(
+                    fn, github_token, pull_request, "redis", "redis", verbose
+                )
             for build_spec in different_build_specs:
                 build_config, id = get_build_config(builders_folder + "/" + build_spec)
                 build_config_metadata = get_build_config_metadata(build_config)
@@ -356,6 +410,8 @@ def builder_process_stream(
                     "tests_priority_lower_limit": tests_priority_lower_limit,
                     "tests_groups_regexp": tests_groups_regexp,
                 }
+                if pull_request is not None:
+                    build_stream_fields["pull_request"] = pull_request
                 if git_branch is not None:
                     build_stream_fields["git_branch"] = git_branch
                 if git_version is not None:
@@ -389,12 +445,44 @@ def builder_process_stream(
                             id, git_hash, benchmark_stream_id
                         )
                     )
-                    builder_list_completed = f"builder:{streamId}:builds_completed"
-                    conn.lpush(builder_list_completed, benchmark_stream_id)
+                    streamId_decoded = streamId.decode()
+                    benchmark_stream_id_decoded = benchmark_stream_id.decode()
+                    builder_list_completed = (
+                        f"builder:{streamId_decoded}:builds_completed"
+                    )
+                    conn.lpush(builder_list_completed, benchmark_stream_id_decoded)
                     conn.expire(builder_list_completed, REDIS_BINS_EXPIRE_SECS)
                     logging.info(
-                        f"Adding information of build->benchmark stream info in list {builder_list_completed}. Adding benchmark stream id: {benchmark_stream_id}"
+                        f"Adding information of build->benchmark stream info in list {builder_list_completed}. Adding benchmark stream id: {benchmark_stream_id_decoded}"
+                    )
+                    benchmark_stream_ids = [benchmark_stream_id_decoded]
+                    comment_body = generate_build_finished_pr_comment(
+                        benchmark_stream_ids,
+                        commit_datetime,
+                        commit_summary,
+                        git_branch,
+                        git_hash,
+                        tests_groups_regexp,
+                        tests_priority_lower_limit,
+                        tests_priority_upper_limit,
+                        tests_regexp,
                     )
+                    if is_actionable_pr:
+                        if contains_regression_comment:
+                            update_comment_if_needed(
+                                auto_approve_github_comments,
+                                comment_body,
+                                old_regression_comment_body,
+                                regression_comment,
+                                verbose,
+                            )
+                        else:
+                            create_new_pr_comment(
+                                auto_approve_github_comments,
+                                comment_body,
+                                github_pr,
+                                pr_link,
+                            )
                 shutil.rmtree(temporary_dir, ignore_errors=True)
                 new_builds_count = new_builds_count + 1
                 build_stream_fields_arr.append(build_stream_fields)

redis_benchmarks_specification/__cli__/args.py

@@ -4,7 +4,7 @@
 #  All rights reserved.
 #
 import datetime
-
+import os
 
 from redis_benchmarks_specification.__common__.env import (
     GH_REDIS_SERVER_HOST,
@@ -21,6 +21,7 @@
 START_TIME_LAST_YEAR_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=7)
 CLI_TOOL_STATS = "stats"
 CLI_TOOL_TRIGGER = "trigger"
+PERFORMANCE_GH_TOKEN = os.getenv("PERFORMANCE_GH_TOKEN", None)
 
 
 def spec_cli_args(parser):
@@ -69,6 +70,15 @@ def spec_cli_args(parser):
         action="store_true",
         help="Include modules statistics on commandstats.",
     )
+    parser.add_argument("--github_token", type=str, default=PERFORMANCE_GH_TOKEN)
+    parser.add_argument("--pull-request", type=str, default=None, nargs="?", const="")
+    parser.add_argument(
+        "--auto-approve",
+        required=False,
+        default=False,
+        action="store_true",
+        help="Skip interactive approval of changes to github before applying.",
+    )
     parser.add_argument("--summary-csv", type=str, default="")
     parser.add_argument("--group-csv", type=str, default="")
     parser.add_argument("--commands-json-file", type=str, default="./commands.json")