Merge branch 'main' of https://github.com/redis/redis-benchmarks-specification into main

Sync with main

Author: slice4e

Readme.md

@@ -323,6 +323,46 @@ redis-benchmarks-spec-sc-coordinator   RUNNING   pid 27842, uptime 0:00:00
 ```
 
 
+## Development
+
+1. Install [pypoetry](https://python-poetry.org/) to manage your dependencies and trigger tooling.
+```sh
+pip install poetry
+```
+
+2. Installing dependencies from lock file
+
+```
+poetry install
+```
+
+### Running formaters
+
+```sh
+poetry run black .
+```
+
+
+### Running linters
+
+```sh
+poetry run flake8
+```
+
+
+### Running tests
+
+A test suite is provided, and can be run with:
+
+```sh
+$ tox
+```
+
+To run a specific test:
+```sh
+$ tox -- utils/tests/test_runner.py
+```
+
 ## License
 
-redis-benchmark-specifications is distributed under the Apache 2 license - see [LICENSE](LICENSE)
+redisbench-admin is distributed under the BSD3 license - see [LICENSE](LICENSE)

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redis-benchmarks-specification"
-version = "0.1.30"
+version = "0.1.35"
 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"
@@ -16,7 +16,7 @@ argparse = "^1.4.0"
 Flask-HTTPAuth = "^4.4.0"
 PyYAML = "^5.4.1"
 docker = "^5.0.0"
-redisbench-admin = "^0.8.6"
+redisbench-admin = "^0.9.3"
 #redisbench-admin = {path = "../redisbench-admin", develop = true}
 psutil = "^5.8.0"
 tox-docker = "^3.1.0"

pyproject.toml

@@ -14,6 +14,15 @@
 SIG_HEADER = "X-Hub-Signature"
 
 
+def should_action(action):
+    res = False
+    types = ["synchronize", "opened", "reopened", "labeled"]
+    for tt in types:
+        if action in tt:
+            res = True
+    return res
+
+
 def create_app(conn, user, test_config=None):
     app = Flask(__name__)
 
@@ -63,7 +72,7 @@ def base():
             trigger_label = PULL_REQUEST_TRIGGER_LABEL
             if "pull_request" in request_data:
                 action = request_data["action"]
-                if "labeled" == action:
+                if should_action(action):
                     pull_request_dict = request_data["pull_request"]
                     head_dict = pull_request_dict["head"]
                     repo_dict = head_dict["repo"]
@@ -93,6 +102,7 @@ def base():
                         )
 
             # Git pushes to repo
+            before_sha = None
             if "ref" in request_data:
                 repo_dict = request_data["repository"]
                 html_url = repo_dict["html_url"].split("/")
@@ -101,11 +111,33 @@ def base():
                 ref = request_data["ref"].split("/")[-1]
                 ref_label = request_data["ref"]
                 sha = request_data["after"]
+                before_sha = request_data["before"]
                 use_event = True
                 event_type = "Git pushes to repo"
 
             if use_event is True:
-                fields = {
+                if before_sha is not None:
+                    fields_before = {
+                        "git_hash": sha,
+                        "ref_label": ref_label,
+                        "ref": ref,
+                        "gh_repo": gh_repo,
+                        "gh_org": gh_org,
+                    }
+                    app.logger.info(
+                        "Using event {} to trigger merge-base commit benchmark. final fields: {}".format(
+                            event_type, fields_before
+                        )
+                    )
+                    result, response_data, err_message = commit_schema_to_stream(
+                        fields_before, conn, gh_org, gh_repo
+                    )
+                    app.logger.info(
+                        "Using event {} to trigger merge-base commit benchmark. final fields: {}".format(
+                            event_type, response_data
+                        )
+                    )
+                fields_after = {
                     "git_hash": sha,
                     "ref_label": ref_label,
                     "ref": ref,
@@ -114,11 +146,11 @@ def base():
                 }
                 app.logger.info(
                     "Using event {} to trigger benchmark. final fields: {}".format(
-                        event_type, fields
+                        event_type, fields_after
                     )
                 )
                 result, response_data, err_message = commit_schema_to_stream(
-                    fields, conn, gh_org, gh_repo
+                    fields_after, conn, gh_org, gh_repo
                 )
                 app.logger.info(
                     "Using event {} to trigger benchmark. final fields: {}".format(