Repository navigation
🐛 fix(ci): native-queue-policy accepts prow dco for v5-reachable sync/v5-to-v6 forward-merges - #17050
Conversation
…/v5-to-v6 forward-merges Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. hive/awaiting-ci: CI pending — sweep will merge when green. 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
There was a problem hiding this comment.
This loosens the merge-queue DCO gate, so I am routing it rather than calling it: @clubanderson (who recorded /hive decision B on #17030) — this is the implementation of B; the one sentence to confirm is whether the narrow shape below is what you intended.
What I verified, reading .github/scripts/native-queue-policy.cjs at f7a5565 against v5 (7a92935):
- Decision provenance. #17030 carries
/hive decision Bfrom @clubanderson and the hive's "Un-parked … Decision: B" receipt, so the PR body's "implements maintainer decision B" is accurate; option C is not touched. - Trust constants are real.
PROW=kubestellar-prow[bot]id208851060,FORWARD_MERGE.author=github-actions[bot]id41898282, both confirmed against the GitHub users API.assertProwDCOfilters statuses oncontext === 'dco' && creator.login && creator.id, so adcostatus posted by a workflow token is ignored (and the test asserts that). - Ancestry check is fail-closed.
reachableFromuses comparebranch...shaand accepts onlybehind/identical. Every non-head commit must bev5-reachable; the head must have exactly two parents, firstv6-reachable, secondv5-reachable. Any miss returns{prow:false}and probotDCOstays required (forwardMergeDCOPathfallback).commits.length >= 250also falls back, which matches the REST cap. - Only when
prow: trueisDCOremoved fromrequired(assertEvidence); all three call sites (replayLastVerdict,pull_request_target,merge_group) now passprthrough, so the shape check runs on every path. - Shape gate requires head repo
== owner/repo, head ref exactlysync/v5-to-v6, basev6, author login+id+type — a fork or a human-opened PR on that branch name never reaches the prow path.
I found no defect. The residual trust question is the one B itself poses: any commit a maintainer merges to v5 becomes DCO-exempt on its way to v6, with prow dco as the sole gate. That is what B says, so I am not re-asking it — just flagging that this is the file it lands in.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Needs a decision, not a merge:
Head: verdict requires_human @f7a5565, 73/73 checks green, DCO yes, soak 0s of 10m0s. What to do: approve this head ( How to release it:
Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
clubanderson
left a comment
There was a problem hiding this comment.
Implements decision B on #17030 as specified: exact head/base/repo/author shape, every non-head commit reachable from v5 via compare API, head verified as the --no-ff merge (parents in v6 and v5 history), 250-commit cap → fallback, prow dco accepted only when posted by kubestellar-prow[bot] by id, pending → wait, failure → fail, path logged. Any doubt falls back to probot DCO. Option C not touched. Tests cover each guard.
/approve
/lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: clubanderson The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
LGTM label has been added. DetailsGit tree hash: b1cf93be2e0c76e03a0fa32f132718d5096ddd3f |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Why
Every v5→v6 forward-merge PR opened by
.github/workflows/v6-topup.yml(#16997, #17024, #17025) failsnative-queue-policywithDCO: action_required: probot DCO rejects a commit that is already on v5 and already passed v5's gate (prowdcogreen). The forward-merge carries it verbatim, so nothing pushed tosync/v5-to-v6can repair the check without rewriting merged v5 history — it recurs by construction.Implements maintainer decision B (narrow, fail-closed). Option C (name-mismatch tolerance) is deliberately not implemented.
Guard conditions (all required, otherwise probot
DCOis required as today)sync/v5-to-v6, head repo is this repo (no forks), basev6.github-actions[bot](login, id 41898282, type Bot) — the identityv6-topup.ymlopens PRs as.v5(compare APIv5...<sha>→behind/identical). One unreachable commit → fallback.--no-ffmerge: exactly two parents, first reachable fromv6, second reachable fromv5.dcocommit status created bykubestellar-prow[bot]must besuccess(adcostatus posted by any other token, e.g.github-actions[bot], is ignored). Missing/pending → bounded wait; failure → fail.The policy output logs the DCO path taken (
probot DCO (App 1861)orprow dco for v5-reachable sync/v5-to-v6 forward-merge) and, on fallback, why. Uses the compare API (checkout is shallow;contents: readalready granted) — no workflow change.Tests (
native-queue-policy.test.cjs)dcostatus or pending → not accepted.Docs:
src/docs/native-merge-queue.md,src/docs/operator-reference/dco-provider-unavailable.md.Closes #17030
— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88