Skip to content

🐛 fix(ci): native-queue-policy accepts prow dco for v5-reachable sync/v5-to-v6 forward-merges - #17050

Merged
kubestellar-prow[bot] merged 1 commit into
v5from
scanner/fix-17030
Nov 7, 2026
Merged

kubestellar-prow[bot] merged 1 commit into
v5from
scanner/fix-17030

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Why

Every v5→v6 forward-merge PR opened by .github/workflows/v6-topup.yml (#16997, #17024, #17025) fails native-queue-policy with DCO: action_required: probot DCO rejects a commit that is already on v5 and already passed v5's gate (prow dco green). The forward-merge carries it verbatim, so nothing pushed to sync/v5-to-v6 can 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 DCO is required as today)

  • Head branch exactly sync/v5-to-v6, head repo is this repo (no forks), base v6.
  • PR author is github-actions[bot] (login, id 41898282, type Bot) — the identity v6-topup.yml opens PRs as.
  • Every PR commit except the head is reachable from v5 (compare API v5...<sha> → behind/identical). One unreachable commit → fallback.
  • The head is the top-up's --no-ff merge: exactly two parents, first reachable from v6, second reachable from v5.
  • Commit list is under the REST 250-commit cap (otherwise unverifiable → fallback).
  • Then the latest prow dco commit status created by kubestellar-prow[bot] must be success (a dco status 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) or prow dco for v5-reachable sync/v5-to-v6 forward-merge) and, on fallback, why. Uses the compare API (checkout is shallow; contents: read already granted) — no workflow change.

Tests (native-queue-policy.test.cjs)

  1. sync/v5-to-v6 + github-actions[bot] + all commits v5-reachable + prow dco success → passes without probot DCO.
  2. One unreachable commit / extra commit / non-merge head / 250-commit list → still requires probot DCO.
  3. Different head branch, fork, author login/id, or base → still requires probot DCO (no ancestry calls made).
  4. prow dco failure → fails; forged non-prow dco status 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

…/v5-to-v6 forward-merges

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added dco-signoff: yes Indicates the PR's author has signed the DCO. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 7, 2026
@github-actions

github-actions Bot commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

Conflicts are checked with every PR merged onto the current tip of v5, so a PR that only needs a rebase is not reported as conflicting with its siblings.

No conflicting open PRs or same-file overlaps were found.

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

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: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 7, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 B from @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] id 208851060, FORWARD_MERGE.author = github-actions[bot] id 41898282, both confirmed against the GitHub users API. assertProwDCO filters statuses on context === 'dco' && creator.login && creator.id, so a dco status posted by a workflow token is ignored (and the test asserts that).
  • Ancestry check is fail-closed. reachableFrom uses compare branch...sha and accepts only behind/identical. Every non-head commit must be v5-reachable; the head must have exactly two parents, first v6-reachable, second v5-reachable. Any miss returns {prow:false} and probot DCO stays required (forwardMergeDCOPath fallback). commits.length >= 250 also falls back, which matches the REST cap.
  • Only when prow: true is DCO removed from required (assertEvidence); all three call sites (replayLastVerdict, pull_request_target, merge_group) now pass pr through, so the shape check runs on every path.
  • Shape gate requires head repo == owner/repo, head ref exactly sync/v5-to-v6, base v6, 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

@hivecommons-hive hivecommons-hive Bot added stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Nov 7, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

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 (f7a5565) to merge as-is, or leave a changes requested review (or reply /hive decision <what to change>) and the hive will push the fix.

How to release it:

  • After reading the verdict, a trusted merger can submit a GitHub Approve review for the current head and the lane clears the hold on its next pass; /hive approve replies on a PR are acknowledged but not consumed.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@clubanderson clubanderson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@kubestellar-prow kubestellar-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow

Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: b1cf93be2e0c76e03a0fa32f132718d5096ddd3f

@kubestellar-prow kubestellar-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 7, 2026
@kubestellar-prow
kubestellar-prow Bot merged commit bde11aa into v5 Nov 7, 2026
105 of 109 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the scanner/fix-17030 branch November 7, 2026 19:56
@github-actions

github-actions Bot commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue labels Nov 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. author/hive This repository's own hive (the App or one of its agent lanes) authored this PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. lgtm Indicates that a PR is ready to be merged. role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/L Denotes a PR that changes 100-499 lines, ignoring generated files. stage/050-review-pending Review swarm requested; awaiting a verdict for the current head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[scanner] native-queue-policy fails every v5→v6 forward-merge when probot DCO rejects an already-merged v5 commit

1 participant