Sync from dev @ 497baf0
Source: main (497baf0) Excluded: live tenant exports, generated artifacts, and dev-only tooling.
This commit is contained in:
@@ -325,28 +325,10 @@ def _current_pr_merge_strategy(pr: dict[str, Any]) -> str:
|
||||
|
||||
def _build_description(workload: str, drift_branch: str, baseline_branch: str, build_number: str, build_id: str) -> str:
|
||||
is_entra = workload.lower() == "entra"
|
||||
lead = "Rolling Entra drift PR created by backup pipeline." if is_entra else "Rolling drift PR created by backup pipeline."
|
||||
lead = "Rolling Entra drift PR — backup pipeline" if is_entra else "Rolling drift PR — backup pipeline"
|
||||
return (
|
||||
f"{lead}\n\n"
|
||||
f"- Source branch: `{drift_branch}`\n"
|
||||
f"- Target branch: `{baseline_branch}`\n"
|
||||
f"- Last pipeline run: `{build_number}` (BuildId: {build_id})\n\n"
|
||||
"The automated review summary is generated immediately after PR creation and inserted "
|
||||
"above the reviewer actions section.\n\n"
|
||||
"## Reviewer Quick Actions\n\n"
|
||||
"### 1) Accept all changes\n"
|
||||
"- Merge PR to accept drift into baseline.\n\n"
|
||||
"### 2) Reject whole PR and revert\n"
|
||||
"- Set reviewer vote to **Reject**.\n"
|
||||
"- Abandon PR.\n"
|
||||
"- Auto-remediation queues restore (if `AUTO_REMEDIATE_ON_PR_REJECTION=true`).\n\n"
|
||||
"### 3) Reject only selected policy changes\n"
|
||||
"- In each `Change Needed` policy thread, comment `/reject` for changes you do not want.\n"
|
||||
"- Optional: use `/accept` for changes you want to keep.\n"
|
||||
"- Wait for review-sync pipeline (about 5 minutes) to update PR diff.\n"
|
||||
"- Merge remaining accepted changes.\n"
|
||||
"- Post-merge auto-remediation queues restore to reconcile tenant to merged baseline "
|
||||
"(if `AUTO_REMEDIATE_AFTER_MERGE=true`)."
|
||||
f"{lead} run `{build_number}` (build {build_id})\n\n"
|
||||
f"Source: `{drift_branch}` → Target: `{baseline_branch}`\n"
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user