feat(jira): sync the full Purple Team workflow status to Jira
Aegis CI / lint-and-test (push) Has been cancelled
Snyk Security Scan / Python vulnerabilities (backend) (push) Has been cancelled
Snyk Security Scan / npm vulnerabilities (frontend) (push) Has been cancelled
Snyk Security Scan / Docker image vulnerabilities (backend) (push) Has been cancelled
Aegis CI / lint-and-test (push) Has been cancelled
Snyk Security Scan / Python vulnerabilities (backend) (push) Has been cancelled
Snyk Security Scan / npm vulnerabilities (frontend) (push) Has been cancelled
Snyk Security Scan / Docker image vulnerabilities (backend) (push) Has been cancelled
Previously only red_executing (-> "In Progress") ever changed the Jira issue's status; every other Aegis transition (red_review, blue_evaluating, blue_review, in_review, validated, rejected, disputed) only posted a comment, leaving the Jira board stuck on whatever status it started with. Expands push_test_event() to a full TestState -> Jira-status table covering the whole lifecycle (To-Do -> In Progress -> RT Test Review -> Queued Blue Team -> In Progress -> Blue Team Test Review -> Validation -> Done/Rejected/Dispute), matching the Purple Team Jira workflow. Adds two new lifecycle hooks that the generic dispatch can't handle correctly: - push_bt_work_started(): blue_evaluating covers both "queued, unclaimed" and "actively being worked" — needs an explicit push when the blue tech clicks Start Evaluation, or it never leaves "Queued Blue Team". - disputed state push: a conflicting lead vote previously produced zero Jira signal at all. Also fills two real gaps: reopen_red_review and reopen_blue_review never synced anything to Jira before. Their target status differs on purpose — reopen_red_review pushes "In Progress" (Aegis resumes the same operator immediately, no re-claim), while reopen_blue_review pushes "Queued Blue Team" (Aegis clears blue_work_started_at, forcing a fresh "Start Evaluation" click) — verified against the actual field-reset behavior in test_entity.py rather than assumed symmetry between the two teams.
This commit is contained in:
@@ -355,6 +355,31 @@ _STATE_EMOJI: dict[str, str] = {
|
||||
"in_review": "📋 In Review",
|
||||
"validated": "✅ Validated",
|
||||
"rejected": "❌ Rejected",
|
||||
"disputed": "⚠️ Disputed",
|
||||
}
|
||||
|
||||
# TestState -> Jira workflow status. These status names must already exist
|
||||
# as valid transition targets in the Purple Team project's Jira workflow
|
||||
# scheme (configured by a Jira admin) — set_issue_status() is a no-op
|
||||
# (logged warning, non-fatal) if the named status isn't a legal transition
|
||||
# from the issue's current status.
|
||||
#
|
||||
# "blue_evaluating" maps to "Queued Blue Team" here because that's the
|
||||
# state's *first-entry* meaning (approved by Red Lead, not yet claimed by
|
||||
# Blue, or re-routed to Blue Team during dispute resolution). When Blue
|
||||
# Lead sends work back to the *same* operator for rework
|
||||
# (reopen_blue_review), that's pushed as "In Progress" directly instead of
|
||||
# through this table — see push_bt_review_reopened().
|
||||
_STATE_TO_JIRA_STATUS: dict[str, str] = {
|
||||
"draft": "To-Do",
|
||||
"red_executing": "In Progress",
|
||||
"red_review": "RT Test Review",
|
||||
"blue_evaluating": "Queued Blue Team",
|
||||
"blue_review": "Blue Team Test Review",
|
||||
"in_review": "Validation",
|
||||
"validated": "Done",
|
||||
"rejected": "Rejected",
|
||||
"disputed": "Dispute",
|
||||
}
|
||||
|
||||
|
||||
@@ -757,19 +782,26 @@ def push_test_event(
|
||||
comment = _build_state_comment(test, new_state, actor, extra)
|
||||
jira.issue_add_comment(link.jira_issue_key, comment)
|
||||
|
||||
# When the operator starts execution: transition to "In Progress"
|
||||
# and assign the ticket to that operator.
|
||||
if new_state == "red_executing":
|
||||
# Transition the Jira issue's status to match the new Aegis state,
|
||||
# per _STATE_TO_JIRA_STATUS. Covers the full Purple Team workflow:
|
||||
# To-Do -> In Progress -> RT Test Review -> Queued Blue Team ->
|
||||
# In Progress -> Blue Team Test Review -> Validation -> Done /
|
||||
# Rejected / Dispute.
|
||||
target_status = _STATE_TO_JIRA_STATUS.get(new_state)
|
||||
if target_status:
|
||||
try:
|
||||
jira.set_issue_status(link.jira_issue_key, "In Progress")
|
||||
jira.set_issue_status(link.jira_issue_key, target_status)
|
||||
logger.info(
|
||||
"Transitioned Jira ticket %s to In Progress", link.jira_issue_key
|
||||
"Transitioned Jira ticket %s to %s", link.jira_issue_key, target_status
|
||||
)
|
||||
except Exception as exc_t:
|
||||
logger.warning(
|
||||
"Could not transition %s to In Progress: %s",
|
||||
link.jira_issue_key, exc_t,
|
||||
"Could not transition %s to %s: %s",
|
||||
link.jira_issue_key, target_status, exc_t,
|
||||
)
|
||||
|
||||
# When the operator starts execution: assign the ticket to that operator.
|
||||
if new_state == "red_executing":
|
||||
jira_account_id = getattr(actor, "jira_account_id", None)
|
||||
if jira_account_id:
|
||||
try:
|
||||
@@ -926,6 +958,45 @@ def push_pause_event(db: Session, test, actor, *, resuming: bool = False) -> Non
|
||||
logger.warning("Failed to push pause event for test %s: %s", test.id, exc, exc_info=True)
|
||||
|
||||
|
||||
def push_bt_work_started(db: Session, test, actor) -> None:
|
||||
"""Transition the Jira issue to "In Progress" when a blue tech picks up
|
||||
a queued test to start evaluating.
|
||||
|
||||
The test's TestState stays "blue_evaluating" throughout (queued AND
|
||||
actively worked are the same Aegis state), so this can't be driven by
|
||||
the generic push_test_event()/_STATE_TO_JIRA_STATUS dispatch — that
|
||||
would incorrectly re-push "Queued Blue Team". Non-fatal.
|
||||
"""
|
||||
if not has_admin_jira_configured(db):
|
||||
return
|
||||
|
||||
link = (
|
||||
db.query(JiraLink)
|
||||
.filter(
|
||||
JiraLink.entity_type == JiraLinkEntityType.test,
|
||||
JiraLink.entity_id == test.id,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if not link:
|
||||
return
|
||||
|
||||
try:
|
||||
jira = get_admin_jira_client(db)
|
||||
ts = datetime.utcnow().strftime("%Y-%m-%d %H:%M UTC")
|
||||
comment = f"h3. ▶ Blue Team Started\n\n*Picked up by:* {actor.username}\n*At:* {ts}"
|
||||
try:
|
||||
jira.set_issue_status(link.jira_issue_key, "In Progress")
|
||||
except Exception as exc_t:
|
||||
logger.warning("Could not transition %s to In Progress: %s", link.jira_issue_key, exc_t)
|
||||
jira.issue_add_comment(link.jira_issue_key, comment)
|
||||
link.last_synced_at = datetime.utcnow()
|
||||
db.flush()
|
||||
logger.info("Posted blue-team-started event to Jira %s", link.jira_issue_key)
|
||||
except Exception as exc:
|
||||
logger.warning("Failed to push blue-team-started event for test %s: %s", test.id, exc, exc_info=True)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# RT/BT date + result custom-field sync
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -408,6 +408,12 @@ def reopen_red_review(db: Session, test: Test, user: User, notes: str) -> Test:
|
||||
except Exception as e:
|
||||
logger.warning("Notification failed for test %s: %s", test.id, e, exc_info=True)
|
||||
|
||||
try:
|
||||
from app.services.jira_service import push_test_event
|
||||
push_test_event(db, test, user, "red_executing", extra={"notes": notes.strip()})
|
||||
except Exception as e:
|
||||
logger.warning("Jira push failed for test %s: %s", test.id, e, exc_info=True)
|
||||
|
||||
return test
|
||||
|
||||
|
||||
@@ -447,6 +453,12 @@ def start_blue_work(db: Session, test: Test, user: User) -> Test:
|
||||
except Exception as e:
|
||||
logger.warning("Jira BT start date push failed for test %s: %s", test.id, e, exc_info=True)
|
||||
|
||||
try:
|
||||
from app.services.jira_service import push_bt_work_started
|
||||
push_bt_work_started(db, test, user)
|
||||
except Exception as e:
|
||||
logger.warning("Jira push failed for test %s: %s", test.id, e, exc_info=True)
|
||||
|
||||
return test
|
||||
|
||||
|
||||
@@ -601,6 +613,12 @@ def reopen_blue_review(db: Session, test: Test, user: User, notes: str) -> Test:
|
||||
except Exception as e:
|
||||
logger.warning("Notification failed for test %s: %s", test.id, e, exc_info=True)
|
||||
|
||||
try:
|
||||
from app.services.jira_service import push_test_event
|
||||
push_test_event(db, test, user, "blue_evaluating", extra={"notes": notes.strip()})
|
||||
except Exception as e:
|
||||
logger.warning("Jira push failed for test %s: %s", test.id, e, exc_info=True)
|
||||
|
||||
return test
|
||||
|
||||
|
||||
@@ -1122,6 +1140,12 @@ def _dispatch_dual_validation_effects(
|
||||
logger.warning("Jira push failed for test %s: %s", test.id, e, exc_info=True)
|
||||
|
||||
elif event.name == "dual_validation_disputed":
|
||||
if actor:
|
||||
try:
|
||||
from app.services.jira_service import push_test_event
|
||||
push_test_event(db, test, actor, "disputed")
|
||||
except Exception as e:
|
||||
logger.warning("Jira push failed for test %s: %s", test.id, e, exc_info=True)
|
||||
# Notify the lead who APPROVED asking them to review the rejection
|
||||
_notify_validation_conflict(db, test, actor)
|
||||
# Notify managers too, in case the dispute stalls and needs escalation
|
||||
|
||||
Reference in New Issue
Block a user