Resolved merge conflicts

Author: subkanthi

.github/actions/create_workflow_report/create_workflow_report.py

@@ -36,7 +36,11 @@
 from clickhouse_driver import Client
 from testflows.core import *
 
-from create_workflow_report import _git_log_merge_prs, get_checks_fails
+from create_workflow_report import (
+    _git_log_merge_prs,
+    get_checks_fails,
+    get_commit_statuses,
+)
 
 
 def check_result_matches_expect(df: pd.DataFrame, expect: list[str]) -> None:
@@ -172,11 +176,55 @@ def test_git_log_merge_prs_includes_fork_prs(self):
         assert set(df["pr_number"]) == {2226, 2252}
 
 
+@TestScenario
+def test_commit_statuses_only_keep_requested_ref(self):
+    """Test statuses written by another ref on the same commit are ignored."""
+    base = "https://altinity-build-artifacts.s3.amazonaws.com"
+    tag = "v26.6.8.20002.altinityantalya"
+    # GitHub returns statuses newest first.
+    statuses = [
+        ("Stress test", "failure", f"{base}/json.html?REF=antalya-26.6&sha=abc"),
+        ("Regression release x", "failure", f"{base}/REFs/antalya-26.6/abc/r.html"),
+        ("Regression release y", "success", f"{base}/REFs/{tag}/abc/r.html"),
+        ("Stress test", "success", f"{base}/json.html?REF={tag}&sha=abc"),
+        ("PR job", "success", f"{base}/json.html?PR=1&sha=abc"),
+    ]
+    response = type(
+        "Response",
+        (),
+        {
+            "status_code": 200,
+            "headers": {},
+            "json": lambda _: [
+                {"context": c, "state": st, "description": "", "target_url": u}
+                for c, st, u in statuses
+            ],
+        },
+    )()
+    with When("I fetch statuses for the release tag"):
+        with patch("create_workflow_report.requests.get", return_value=response):
+            df = get_commit_statuses("abc", 0, tag)
+
+    with Then("only statuses of the tag remain"):
+        assert dict(zip(df["job_name"], df["job_status"])) == {
+            "Stress test": "success",
+            "Regression release y": "success",
+        }
+
+    with When("I fetch statuses for a pull request run"):
+        with patch("create_workflow_report.requests.get", return_value=response):
+            df = get_commit_statuses("abc", 1, "some-branch")
+
+    with Then("statuses are not filtered by ref"):
+        assert set(df["job_name"]) == {"Stress test", "Regression release x", "Regression release y", "PR job"}
+
+
 @Name("test report queries")
 @TestModule
 def test_report_queries(self):
     Scenario(run=test_checks_fails_query, flags=TE)
     Scenario(run=test_git_log_merge_prs_includes_fork_prs, flags=TE)
+    Scenario(run=test_commit_statuses_only_keep_requested_ref, flags=TE)
 
 
 if main():

.github/actions/create_workflow_report/test_prs_in_release.py

@@ -2,7 +2,7 @@
 
 name: Fast Builds
 concurrency:
-  group: ${{ github.workflow }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on:
   workflow_dispatch:

.github/actions/create_workflow_report/test_report_queries.py

@@ -975,25 +975,25 @@ class JobConfigs:
             for total_batches in (2,)
             for batch in range(1, total_batches + 1)
         ],
-        # One shard can lose worker concurrency mid-suite under MSan and
-        # overrun the shared 3.5h functional-test budget.
-        *[
+        # NOTE (strtgbb): 64g keeps MSan at 6 workers, Lower mem can cause workers to be killed
+         *[
             Job.ParamSet(
                 parameter=f"amd_msan, WasmEdge, parallel, {batch}/{total_batches}",
-                runs_on=RunnerLabels.FUNC_TESTER_AMD,
+                runs_on=RunnerLabels.AMD_LARGE,
                 requires=[ArtifactNames.CH_AMD_MSAN_GH],
                 timeout=3600 * 4,
             )
-            for total_batches in (8,)
+            for total_batches in (6,)
             for batch in range(1, total_batches + 1)
         ],
+        # NOTE (strtgbb): 2/2 was ~3.3h of sequential work and overran 3.5h in teardown.
         *[
             Job.ParamSet(
                 parameter=f"amd_msan, WasmEdge, sequential, {batch}/{total_batches}",
                 runs_on=RunnerLabels.AMD_SMALL_MEM,
                 requires=[ArtifactNames.CH_AMD_MSAN_GH],
             )
-            for total_batches in (2,)
+            for total_batches in (4,)
             for batch in range(1, total_batches + 1)
         ],
         Job.ParamSet(

.github/workflows/fast_builds.yml

@@ -83,7 +83,7 @@ class Templates:
   workflow_dispatch:{DISPATCH_INPUTS_BLOCK}
 
 concurrency:
-  group: ${{{{{{{{ github.workflow }}}}}}}}
+  group: ${{{{{{{{ github.workflow }}}}}}}}-${{{{{{{{ github.ref }}}}}}}}
 
 env:
   PYTHONUNBUFFERED: 1
@@ -103,7 +103,7 @@ class Templates:
 
 name: {NAME}
 concurrency:
-  group: ${{{{{{{{ github.workflow }}}}}}}}
+  group: ${{{{{{{{ github.workflow }}}}}}}}-${{{{{{{{ github.ref }}}}}}}}
   cancel-in-progress: true
 on:
   workflow_dispatch:{DISPATCH_INPUTS_BLOCK}{WORKFLOW_CALL}{TAG_PUSH_TRIGGER}

.github/workflows/master.yml

@@ -53,6 +53,7 @@ def test_dispatch_with_tags_renders_boolean_input_and_tag_trigger():
     assert "type: boolean" in yaml_text
     assert "push:" in yaml_text
     assert "tags: ['*']" in yaml_text
+    assert "group: ${{ github.workflow }}-${{ github.ref }}" in yaml_text
     assert "cancel-in-progress: true" in yaml_text
 
 
@@ -67,6 +68,7 @@ def test_schedule_concurrency_does_not_cancel_in_progress():
     )
 
     assert "concurrency:" in yaml_text
+    assert "group: ${{ github.workflow }}-${{ github.ref }}" in yaml_text
     assert "cancel-in-progress:" not in yaml_text