Skip to content

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

Closed

Description

@hivecommons-hive

Summary

Every forward-merge PR onto v6 opened by .github/workflows/v6-topup.yml fails native-queue-policy with Error: DCO: action_required, and has to be merged by hand. Three instances today:

Cause

native-queue-policy (.github/scripts/native-queue-policy.cjs, evidenceForHead) requires the probot DCO check-run to have succeeded on the exact head. Probot flags commit 03094ce (the v5 squash of #17014): author Andy Anderson <andy@clubanderson.com> vs every Signed-off-by: Andrew Anderson <andy@clubanderson.com> — same email, different display name. The prow dco check (label dco-signoff: yes) is green.

That commit is already on v5. The forward-merge carries it verbatim, so nothing pushed to sync/v5-to-v6 can repair the check without rewriting merged v5 history. Any v5 commit that probot rejects will keep re-failing every subsequent top-up until it is carried onto v6, so this recurs by construction. The scanner has triaged #17025 and deferred (comment on the PR); no PR-side repair is possible.

Decision needed

Risk: governance — this is the DCO gate, so the hive will not loosen it on its own.

  • A. Status quo: a maintainer uses probot's "Set DCO to pass" or merges each forward-merge PR by hand. No code change; the top-up PRs stay red in the queue until someone looks.
  • B. native-queue-policy accepts the prow dco check (or the dco-signoff: yes label) in place of probot DCO only for PRs whose head is the top-up workflow's sync/v5-to-v6 branch and whose commits are all already reachable from the source release line (v5). Everything else keeps requiring probot DCO.
  • C. Make probot DCO stop flagging the commit class instead: configure the DCO app to compare email only (.github/dco.yml allowRemediationCommits / name-mismatch tolerance), or have the v5 squash-merge gate reject author-name/sign-off-name mismatches before they land on v5, so forward-merges are never asked to carry one.

Reply with /hive decision A|B|C. B or C can be implemented by the hive once chosen.

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

Activity

  1. added
    agent/scannerCreated or modified by the scanner agent
    ciApproved by a Hive merger/owner for auto-merge on green CI
    stage/045-needs-decisionIssue parked on a person: needs-human or a maintainer decision is owed before the hive picks it up
    on Nov 7, 2026
  2. hivecommons-hive commented on Nov 7, 2026

    @hivecommons-hive
    ContributorAuthor

    What to reply

    • /hive approve: go with the recommendation
    • /hive decision <your instructions>: go ahead, following your instructions
    • /hive help: show these again

    If what this issue waited on has been done (a merged fix, or an action taken outside this repository), a maintainer can reply /fixed to close it as completed; Hive clears its park labels.

    Only a maintainer with write access can un-park; everything else is ignored. Full command reference: https://github.com/hivecommons/hive/blob/v5/src/docs/maintainer-commands.md.

  3. added
    help wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.
    on Nov 7, 2026
  4. clubanderson commented on Nov 7, 2026

    @clubanderson
    Member

    /hive decision B

    Rationale: the commits on sync/v5-to-v6 are already on v5 and passed that branch's gate (prow dco green). Re-requiring probot DCO on a forward-merge adds no governance and cannot be repaired PR-side. Keep B narrow, fail closed:

    • Head branch must be exactly sync/v5-to-v6 and the PR must be opened by the top-up workflow identity.
    • Every commit in the PR must be reachable from origin/v5 (git merge-base --is-ancestor); one unreachable commit → fall back to requiring probot DCO as today.
    • Accept the prow dco check success (not just the label).
    • Log which path was taken in the policy output.

    Do not do C: name-mismatch tolerance loosens DCO for every PR. The underlying author/sign-off display-name mismatch is mine to fix on my side.

    Also: admin-merge #17025 now so v6 stays level while this lands.

  5. added
    stage/010-actionableTriaged; eligible for the hive to pick up
    and removed
    stage/045-needs-decisionIssue parked on a person: needs-human or a maintainer decision is owed before the hive picks it up
    on Nov 7, 2026
  6. hivecommons-hive commented on Nov 7, 2026

    @hivecommons-hive
    ContributorAuthor

    Un-parked by @clubanderson. Decision: B

    stage/045-needs-decision is cleared when present and approved-direction is applied; any hold label is left exactly as it was.

  7. hivecommons-hive commented on Nov 7, 2026

    @hivecommons-hive
    ContributorAuthor

    🔒 Claimed by agent scanner (agent on hive hosted-available-oke-11-placeholder-r05x). The claim lasts 2h0m0s without activity and renews while the work continues. Reply /unclaim to release, or /claim to take it over if you outrank the holder.

    Claim history
    • 2026-11-07 18:35 UTC — claimed by scanner (agent on hive hosted-available-oke-11-placeholder-r05x)
  8. hivecommons-hive commented on Nov 7, 2026

    @hivecommons-hive
    ContributorAuthor

    Folded finding. This was filed as a separate issue, but 1 open agent-filed issue (plus 2 closed as completed in the last 14 days) already cite github/scripts/native-queue-policy.cjs, so it was folded into the oldest of them instead of opening another. Treat this issue as the tracker for that component: prefer one structural fix that covers every folded variant over a PR per variant.

    [adjudicator] v5→v6 forward-merges fail native-queue-policy: probot DCO rejects squash author name 'Andy Anderson' vs sign-off 'Andrew Anderson'

    Problem

    Forward-merge PRs from v5 into v6 (currently #17025) cannot pass native-queue-policy and park at needs-human whenever v5 carries a squash commit by the maintainer:

    These commits are already v5 history; nothing can be pushed to the sync branch to fix them. The last forward-merge (#16997) was merged by hand for the same reason. This will recur on every v5→v6 top-up until one of the options below is chosen.

    Options (human decision — each weakens or changes a DCO/policy control)

    1. Align identities (no code change): set the GitHub profile name to Andrew Anderson, or sign off as Andy Anderson, so squash authors match trailers. Fixes future commits only.
    2. .github/dco.yml on the default branch (v5) with
      require:
        members: false
      probot then skips org members' commits. Note probot reads the config from the default branch.
    3. Policy change in .github/scripts/native-queue-policy.cjs (pushable, not under .github/workflows/): accept the prow dco check (or Sign-off survives the squash) as alternate DCO evidence when the PR author is hive-release[bot]/github-actions[bot] and the head is a merge commit whose parents are both branch tips. Needs a test in native-queue-policy.test.cjs.

    Immediate action for #17025

    Admin merge with a merge commit (not squash), as was done for #16997. All other checks on ce3a6b7 are green and mergeable=MERGEABLE.

    This needs a human or an ISSUES_PRS_MERGE agent: the adjudicator tier can neither admin-merge nor decide a DCO governance change. Refs #17025.

    — hive: agent=adjudicator-2

  9. github-actions commented on Nov 7, 2026

    @github-actions
    Contributor

    @hivecommons-hive[bot] this issue was closed by @kubestellar-prow[bot] as completed.

    If this was closed by a merged PR, the fix only takes effect once it ships in a tagged release and your deployment updates to it — check your running version against the fix before concluding the fix failed.

    If you are still seeing the problem, comment /reopen and it will be reopened for you — you do not need write access. Please add what you are still observing (running version, logs, steps) so it is not closed the same way again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    agent/scannerCreated or modified by the scanner agentapproved-directionciApproved by a Hive merger/owner for auto-merge on green CIhelp wantedDenotes an issue that needs help from a contributor. Must meet "help wanted" guidelines.

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions