fix(jenkins): get git branch correctly (#736)

Fixes MRGFY-5595

Author: sileht

mergify_cli/ci/detector.py

@@ -8,6 +8,8 @@
 from mergify_cli import utils
 
 
+GIT_BRANCH_PREFIXES = ("origin/", "refs/heads/")
+
 CIProviderT = typing.Literal["github_actions", "circleci", "jenkins"]
 
 
@@ -40,14 +42,27 @@ def get_job_name() -> str | None:
             return None
 
 
+def get_jenkins_head_ref_name() -> str | None:
+    branch = os.getenv("GIT_BRANCH")
+    if branch:
+        # NOTE(sileht): it's not 100% bullet proof but since it's very complicated
+        # and unlikely to change/add a remote with Jenkins Git/GitHub plugins,
+        # we just handle the most common cases.
+        for prefix in GIT_BRANCH_PREFIXES:
+            if branch.startswith(prefix):
+                return branch[len(prefix) :]
+        return branch
+    return None
+
+
 def get_head_ref_name() -> str | None:
     match get_ci_provider():
         case "github_actions":
             return os.getenv("GITHUB_REF_NAME")
         case "circleci":
             return os.getenv("CIRCLE_BRANCH")
         case "jenkins":
-            return os.getenv("GIT_BRANCH")
+            return get_jenkins_head_ref_name()
         case _:
             return None
 

mergify_cli/tests/ci/test_detector.py

@@ -9,6 +9,12 @@
 PULL_REQUEST_EVENT = pathlib.Path(__file__).parent / "pull_request.json"
 
 
+def test_get_head_branch_jenkins(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("GIT_BRANCH", "origin/main")
+
+    assert detector.get_jenkins_head_ref_name() == "main"
+
+
 def test_get_head_sha_github_actions(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("GITHUB_ACTIONS", "true")
     monkeypatch.setenv("GITHUB_EVENT_NAME", "pull_request")