Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Stage engine: a PR observed on a repo whose auto-merge is off (`repo-auto-merge-disabled`) is now staged from its head evidence (050 / 07x / 085, or 090 "auto-merge off" when approved and green) instead of being dropped as a lane hand-off (#17565).
44 changes: 43 additions & 1 deletion src/pkg/stageengine/derive_pr_classify.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func StageHumanApprovalReason(d stageDetail, head string) string {

// stageHandoffReasons are reasons that mean "not this lane's PR".
var stageHandoffReasons = map[string]bool{
"not-app-authored": true, trustedBotLaneSkipReason: true, "repo-auto-merge-disabled": true,
"not-app-authored": true, trustedBotLaneSkipReason: true,
trustedAuthorReasonAppAuthored: true, contributorLaneReasonAppAuthored: true, contributorLaneReasonNoAuthor: true, "missing-head-sha": true,
"fetch-pr": true, "fetch-pr-recheck": true,
// A merge to the destination was in flight, so the lane did not look at
Expand Down Expand Up @@ -473,6 +473,48 @@ func ClassifyStage(o stageObservation) stageVerdict {
}
return WithHumanApprovalReason(stageVerdict{Stage: stagelabels.ReadyForHumanMerge, Rank: stageRankOwned, Human: true}, humanApprovalReason)
}
if reason == "repo-auto-merge-disabled" {
// Auto-merge is off for the repo (hivecommons/hive#17565): nothing
// will merge the head, so its stage comes from the head's own
// evidence and is never 080, 095 or 100. Approved and green parks
// at 090 under the lane reason, the "auto-merge off" human merge.
if HasLabelFold(o.Labels, "needs-rebase") {
return stageVerdict{Stage: fixing, Rank: stageRankOwned}
}
if v, ok := HumanChangeRequestStage(o); ok {
return v
}
if VerdictBlocks(o.Detail) {
return stageVerdict{Stage: fixing, Rank: stageRankOwned, Reason: StageVerdictReason(o.Detail)}
}
if v, ok := RequiresHumanStage(o, stageRankOwned); ok {
return v
}
if d := o.Detail; d.VerdictKnown && d.Verdict.DecisionRequested && (strings.TrimSpace(d.HumanApprover) == "" || strings.TrimSpace(d.HumanApprovalHead) != strings.TrimSpace(o.HeadSHA)) {
// An approve verdict that still asks a question is not ready
// for a merge click: the person owes the decision first.
return stageVerdict{Stage: stagelabels.NeedsDecision, Rank: stageRankOwned, Human: true, Reason: StageVerdictReason(d)}
}
if v, ok := SharedCIDeferredStage(o); ok {
return v
}
if v, ok := BaseBranchRedStage(o); ok {
return v
}
if v, ok := ForkGuardStage(o); ok {
return v
}
if name := o.Detail.RedCheck(o.HeadSHA); name != "" {
return stageVerdict{Stage: fixing, Rank: stageRankOwned, Reason: stageReasonOptionalCheckFailing + name}
}
if o.Detail.SentinelAlert || len(stagelabels.Holds(o.Labels)) > 0 {
return stageVerdict{Stage: stagelabels.NeedsDecision, Rank: stageRankOwned, Human: true}
}
if !AuthorSideDone(o) && humanApprovalReason == "" {
return stageVerdict{Stage: stagelabels.ReviewPending, Rank: stageRankOwned}
}
return WithHumanApprovalReason(stageVerdict{Stage: stagelabels.ReadyForHumanMerge, Rank: stageRankOwned, Human: true}, humanApprovalReason)
}
// An open issue the PR closes is held or parked on a person:
// removing the issue's label releases the PR on the next sweep.
if _, _, _, linked := prstage.ParseLinkedIssueReason(reason); linked ||
Expand Down
58 changes: 58 additions & 0 deletions src/pkg/stageengine/derive_pr_repo_automerge_off_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package stageengine

import (
"testing"

"github.com/hivecommons/hive/pkg/stageengine/prstage"
"github.com/hivecommons/hive/pkg/stagelabels"
)

// hivecommons/hive#17565: on a repo whose auto-merge is off nothing merges
// the head, so a lane observation under "repo-auto-merge-disabled" is
// classified from the head's evidence instead of being dropped as a
// hand-off: never 080, 095 or 100, and approved and green is the
// "090 · auto-merge off" human merge.
func TestClassifyStageRepoAutoMergeDisabledFromHeadEvidence(t *testing.T) {
const reason = "repo-auto-merge-disabled"
approve := ContributorLaneVerdict{Configured: true, Approved: true, Verdict: "approve"}
for _, tc := range []struct {
name string
labels []string
detail stageDetail
want stagelabels.Stage
wantHuman bool
}{
{name: "no verdict", want: stagelabels.ReviewPending},
{name: "approve and green", detail: stageDetail{VerdictKnown: true, Verdict: approve}, want: stagelabels.ReadyForHumanMerge, wantHuman: true},
{name: "approve and red", detail: stageDetail{VerdictKnown: true, Verdict: approve, RedChecks: []string{"unit"}, RedChecksHead: goldenHead}, want: stagelabels.Fixing},
{name: "changes requested", detail: stageDetail{VerdictKnown: true, Verdict: ContributorLaneVerdict{Configured: true, Verdict: "changes_requested"}}, want: stagelabels.Fixing},
{name: "requires human", detail: stageDetail{VerdictKnown: true, Verdict: ContributorLaneVerdict{Configured: true, Verdict: "requires_human"}}, want: stagelabels.NeedsDecision, wantHuman: true},
{name: "decision requested", detail: stageDetail{VerdictKnown: true, Verdict: ContributorLaneVerdict{Configured: true, Approved: true, Verdict: "approve", DecisionRequested: true}}, want: stagelabels.NeedsDecision, wantHuman: true},
{name: "needs-rebase label", labels: []string{"needs-rebase"}, detail: stageDetail{VerdictKnown: true, Verdict: approve}, want: stagelabels.Fixing},
{name: "sentinel alert", detail: stageDetail{VerdictKnown: true, Verdict: approve, SentinelAlert: true}, want: stagelabels.NeedsDecision, wantHuman: true},
{name: "hold label", labels: []string{"hold"}, detail: stageDetail{VerdictKnown: true, Verdict: approve}, want: stagelabels.NeedsDecision, wantHuman: true},
} {
t.Run(tc.name, func(t *testing.T) {
for _, lane := range []string{stageLaneSelf, stageLaneTrusted, stageLaneContributor} {
obs := stageObservation{Lane: lane, HeadSHA: goldenHead, Reason: reason, Labels: tc.labels, Detail: tc.detail}
got := ClassifyStage(obs)
want := tc.want
if want == stagelabels.Fixing {
want = FixingStage(stageObservation{Lane: lane})
}
if got.Stage != want || got.Rank != stageRankOwned || got.Human != tc.wantHuman || got.Terminal {
t.Fatalf("%s lane: got %+v, want stage %v rank owned human=%v", lane, got, want, tc.wantHuman)
}
if want == stagelabels.ReadyForHumanMerge {
recorded := got.Reason
if recorded == "" {
recorded = obs.Reason
}
if hm := prstage.HumanMergeReason(recorded); hm != prstage.HumanMergeReasonAutoMergeOff {
t.Fatalf("%s lane: 090 human-merge reason %q (recorded %q), want %q", lane, hm, recorded, prstage.HumanMergeReasonAutoMergeOff)
}
}
}
})
}
}
Loading
Loading