Accept 3-digit Jira fix version for pre-GA hotfix branches

When hotfix/X.Y.Z has no GA tag yet (hfrev == 0, target version ends
in ".0"), the Jira project may not have an "X.Y.Z.0" release entry yet.
Allow either the 4-digit form ("10.0.0.0") OR the 3-digit base ("10.0.0")
to satisfy the fix-version check.

Once the GA tag is pushed, hfrev advances to 1, the target becomes
"10.0.0.1", and only that exact 4-digit version is accepted again —
matching the existing post-GA behaviour.

Also update the incorrect_fix_version.md template: the condition now
checks whether the last expected version has 4 digits (covers both
pre-GA with two alternatives and post-GA with one), replacing the
prior "length == 1" check that would miss the pre-GA two-version case.

Add bert_e/tests/unit/test_jira.py with 13 unit tests covering:
- pre-GA: 4-digit accepted, 3-digit accepted, wrong/missing rejected
- post-GA: correct hfrev accepted, 3-digit base and wrong hfrev rejected
- dev-branch: existing behaviour unchanged

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: charlesprost

bert_e/templates/incorrect_fix_version.md

@@ -13,8 +13,8 @@ The `Fix Version/s` in issue {{ issue.key }} contains:
 * *None*
 {% endfor %}
 
-{% if expect_versions|length == 1 and expect_versions[0].split('.')|length == 4 %}
-Considering where you are trying to merge, I expected to find at least:
+{% if expect_versions and expect_versions[-1].split('.')|length == 4 %}
+Considering where you are trying to merge, I expected to find at least one of:
 {% else %}
 Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
 {% endif %}

bert_e/tests/unit/test_jira.py

@@ -0,0 +1,121 @@
+"""Unit tests for check_fix_versions in jira.py.
+
+Covers the pre-GA hotfix dual-acceptance rule:
+  - When the hotfix branch has no GA tag yet (hfrev == 0 → target ends
+    in ".0"), both the 4-digit form ("10.0.0.0") AND the 3-digit base
+    ("10.0.0") must be accepted.
+  - Once the GA tag is pushed (hfrev advances to 1 → target becomes
+    "10.0.0.1"), only the exact 4-digit version is accepted again.
+"""
+import pytest
+from types import SimpleNamespace
+
+from bert_e import exceptions
+from bert_e.workflow.gitwaterflow.jira import check_fix_versions
+
+
+def _make_issue(*version_names):
+    versions = [SimpleNamespace(name=v) for v in version_names]
+    return SimpleNamespace(
+        key='TEST-00001',
+        fields=SimpleNamespace(fixVersions=versions),
+    )
+
+
+def _make_job(*target_versions):
+    cascade = SimpleNamespace(target_versions=list(target_versions))
+    git = SimpleNamespace(cascade=cascade)
+    return SimpleNamespace(git=git, active_options=[])
+
+
+# ---------------------------------------------------------------------------
+# Pre-GA hotfix: target ends in ".0" (hfrev == 0, no GA tag yet)
+# ---------------------------------------------------------------------------
+
+def test_pre_ga_hotfix_accepts_four_digit_version():
+    """Jira with '10.0.0.0' is accepted for pre-GA hotfix/10.0.0."""
+    check_fix_versions(_make_job('10.0.0.0'), _make_issue('10.0.0.0'))
+
+
+def test_pre_ga_hotfix_accepts_three_digit_version():
+    """Jira with '10.0.0' is accepted for pre-GA hotfix/10.0.0 (no GA tag)."""
+    check_fix_versions(_make_job('10.0.0.0'), _make_issue('10.0.0'))
+
+
+def test_pre_ga_hotfix_accepts_three_digit_among_others():
+    """Jira with '10.0.0' among other versions is still accepted."""
+    check_fix_versions(
+        _make_job('10.0.0.0'),
+        _make_issue('9.5.3', '10.0.0', '11.0.0'),
+    )
+
+
+def test_pre_ga_hotfix_rejects_wrong_version():
+    """Unrelated version is rejected for pre-GA hotfix/10.0.0."""
+    with pytest.raises(exceptions.IncorrectFixVersion):
+        check_fix_versions(_make_job('10.0.0.0'), _make_issue('9.5.0'))
+
+
+def test_pre_ga_hotfix_rejects_empty_versions():
+    """No fix version in Jira is rejected for pre-GA hotfix/10.0.0."""
+    with pytest.raises(exceptions.IncorrectFixVersion):
+        check_fix_versions(_make_job('10.0.0.0'), _make_issue())
+
+
+def test_pre_ga_hotfix_rejects_next_micro():
+    """'10.0.1' is not a valid substitute for pre-GA '10.0.0.0'."""
+    with pytest.raises(exceptions.IncorrectFixVersion):
+        check_fix_versions(_make_job('10.0.0.0'), _make_issue('10.0.1'))
+
+
+# ---------------------------------------------------------------------------
+# Post-GA hotfix: target does NOT end in ".0" (hfrev >= 1, GA tag exists)
+# ---------------------------------------------------------------------------
+
+def test_post_ga_hotfix_accepts_correct_4digit():
+    """'10.0.0.1' in Jira is accepted for post-GA hotfix (hfrev=1)."""
+    check_fix_versions(_make_job('10.0.0.1'), _make_issue('10.0.0.1'))
+
+
+def test_post_ga_hotfix_rejects_3digit_base():
+    """'10.0.0' is NOT accepted once GA tag exists (target is '10.0.0.1')."""
+    with pytest.raises(exceptions.IncorrectFixVersion):
+        check_fix_versions(_make_job('10.0.0.1'), _make_issue('10.0.0'))
+
+
+def test_post_ga_hotfix_rejects_pre_ga_4digit():
+    """'10.0.0.0' is NOT accepted once GA tag exists (target is '10.0.0.1')."""
+    with pytest.raises(exceptions.IncorrectFixVersion):
+        check_fix_versions(_make_job('10.0.0.1'), _make_issue('10.0.0.0'))
+
+
+def test_post_ga_second_hotfix():
+    """'10.0.0.2' in Jira is accepted for second post-GA hotfix (hfrev=2)."""
+    check_fix_versions(_make_job('10.0.0.2'), _make_issue('10.0.0.2'))
+
+
+def test_post_ga_hotfix_rejects_lower_hfrev():
+    """'10.0.0.1' is NOT accepted when target is '10.0.0.2'."""
+    with pytest.raises(exceptions.IncorrectFixVersion):
+        check_fix_versions(_make_job('10.0.0.2'), _make_issue('10.0.0.1'))
+
+
+# ---------------------------------------------------------------------------
+# Regular dev-branch PR (not hotfix) — pre-existing behaviour unchanged
+# ---------------------------------------------------------------------------
+
+def test_dev_branch_accepts_matching_versions():
+    """Standard 3-digit dev-branch version check still works."""
+    check_fix_versions(
+        _make_job('4.3.19', '5.1.4'),
+        _make_issue('4.3.19', '5.1.4'),
+    )
+
+
+def test_dev_branch_rejects_mismatch():
+    """Wrong versions for a dev-branch PR are still rejected."""
+    with pytest.raises(exceptions.IncorrectFixVersion):
+        check_fix_versions(
+            _make_job('4.3.19', '5.1.4'),
+            _make_issue('4.3.18', '5.1.4'),
+        )

bert_e/workflow/gitwaterflow/jira.py

@@ -165,11 +165,19 @@ def check_fix_versions(job, issue):
             hf_target = target_version
 
     if hf_target:
-        if hf_target not in issue_versions:
+        # Pre-GA: the hotfix branch has no tag yet (hfrev == 0 → target ends
+        # in ".0").  The Jira project may not have a ".0" release entry yet,
+        # so also accept the 3-digit base version (e.g. "10.0.0" for "10.0.0.0").
+        # Once the GA tag is pushed hfrev advances to 1, the target becomes
+        # "10.0.0.1", and only that exact version is accepted again.
+        accepted = {hf_target}
+        if hf_target.endswith('.0'):
+            accepted.add(hf_target[:-2])
+        if not (accepted & issue_versions):
             raise exceptions.IncorrectFixVersion(
                 issue=issue,
                 issue_versions=sorted(issue_versions),
-                expect_versions=sorted(expected_versions),
+                expect_versions=sorted(accepted),
                 active_options=job.active_options
             )
     elif checked_versions != expected_versions: