Skip to content

πŸ› fix(ci): backport the native-queue-policy forward-merge dco path to v6 - #17121

Closed
hivecommons-hive[bot] wants to merge 2 commits into
v6from
scanner/backport-17050-v6
Closed

hivecommons-hive[bot] wants to merge 2 commits into
v6from
scanner/backport-17050-v6

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Backports #16988 and #17050 (the fix for #17030) from v5 onto v6.

Why: native-queue-policy.yml deliberately checks out the base branch head to validate a PR, never the candidate. For a v5β†’v6 forward-merge the base is v6, whose copy of .github/scripts/native-queue-policy.cjs predates #17050 β€” so the prow-dco path for v5-reachable sync/v5-to-v6 commits never runs, and probot DCO: action_required (profile-name "Andy" vs sign-off "Andrew" on already-merged v5 squash commits) fails the check. Every forward-merge into v6 is therefore blocked until v6 itself carries the path (#17025 has hit this three times and is escalated). The forward-merges carry the fix in their own diff, but the workflow never reads it β€” chicken-and-egg; this PR breaks it.

Clean git cherry-pick -x -s of both v5 commits, no conflicts. Both are .github/ + docs only, so no changelog.d fragment is needed. The next sync/v5-to-v6 merge will see identical content and merge cleanly.

Refs #17030 (already closed by #17050 on v5; this is the v6 half). Unblocks #17025.

β€” hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

hivecommons-hive Bot and others added 2 commits November 7, 2026 17:45
…policy verdict (#16988)

* fix(ci): re-validate policy checks before replaying a native-queue-policy verdict

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* fix(ci): fall through to the full wait when a replayed policy provider is pending

replayLastVerdict re-validates POLICY_CHECKS before replaying a prior
success, but assertEvidence throws PendingEvidence for a missing or
still-running provider and the workflow's replay step only tolerates
transient API errors. A cosmetic label flip during a provider re-run
therefore failed native-queue-policy outright with no retry. Catch
PendingEvidence and return null so the caller runs the normal polling
wait; add queued/in-progress/missing provider tests.

Hive-Fix-Attempt: 1/6
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com>

* fix(ci): fall through on DCO UNKNOWN during replay; refresh replay docs

Address review findings on #16988:
- replayLastVerdict now returns null for ProviderUnavailable too, so the
  full wait re-raises it once and renders the runbook job summary instead
  of a bare setFailed from the label-flip step.
- Re-flow the replayLastVerdict doc comment to ~80 columns.
- native-merge-queue.md: replay re-validates the five policy checks on
  the head; red fails, pending/missing/UNKNOWN falls through.
- Test: UNKNOWN DCO on replay falls through.

Hive-Fix-Attempt: 2/6
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com>

---------

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
(cherry picked from commit eac7f88)
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
…/v5-to-v6 forward-merges (#17050)

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
(cherry picked from commit bde11aa)
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 7, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign danathar for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 kubestellar-prow Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 7, 2026
@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
@github-actions

github-actions Bot commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

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

PR Title Relation Files
#17118 🌱 top-up: forward-merge v5 into v6 (v6 release line cut, v5.187–v5.189) same files .github/scripts/native-queue-policy.cjs
.github/scripts/native-queue-policy.test.cjs
src/docs/native-merge-queue.md
src/docs/operator-reference/dco-provider-unavailable.md
#17025 🌱 Forward-merge v5 into v6 (1 commits) CONFLICT .github/scripts/native-queue-policy.cjs

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Nov 7, 2026
@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: d1d57823e

β€” hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot changed the title πŸ› fix(ci): backport native-queue-policy forward-merge dco path to v6 (#17050) πŸ› fix(ci): backport the native-queue-policy forward-merge dco path to v6 Nov 7, 2026
@hivecommons-hive hivecommons-hive Bot added stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it labels Nov 7, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Supersession sweep found that this PR's claimed issue is already closed by another merged PR.

  • Claimed issue: hive#17030
  • Closing PR: #17050

Closing this hive-authored PR because the claimed issue was already closed by the merged PR below.

This comment is edited in place by the supersession sweep; it is not duplicated.

@hivecommons-hive hivecommons-hive Bot added the hive/superseded Closed by Hive: a different merged PR already landed this change label Nov 7, 2026
@hivecommons-hive hivecommons-hive Bot closed this 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.

No-op against v6: #17118 (merged as 87bfaf3e9) already carries this exact change.

What I verified from the tree, not the PR body:

  • git diff origin/v6 pr17121 -- .github/scripts/native-queue-policy.cjs .github/scripts/native-queue-policy.test.cjs is empty β€” both files on this branch are byte-identical to the current v6 tip.
  • v6 history on .github/scripts/native-queue-policy.cjs already has bde11aa2c (#17050) and eac7f886d (#16988), brought in by the forward-merge #17118 (87bfaf3e9 Merge pull request #17118 from hivecommons/topup/v5-to-v6-release-line).
  • The branch is also byte-identical to v5 for these two files, so the backport itself was accurate β€” it was just overtaken while open (merge-base dd6b37214 is 37 commits behind v6).

The code itself: forwardMergeDCOPath (native-queue-policy.cjs:170-207) is the same narrow shape check that is already live on v6, so there is nothing new to review here.

Flagging for a maintainer: this can be closed as superseded by #17118. I have not closed anything.

β€” hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

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

Labels

author/hive This repository's own hive (the App or one of its agent lanes) authored this PR conflicts-with-open-pr Open PR has a merge conflict with another open PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. hive/superseded Closed by Hive: a different merged PR already landed this change 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.

0 participants