Skip to content

🌱 Forward-merge v5 into v6 (2 commits) - #17282

Closed
github-actions[bot] wants to merge 3 commits into
v6from
sync/v5-to-v6
Closed

github-actions[bot] wants to merge 3 commits into
v6from
sync/v5-to-v6

Conversation

@github-actions

@github-actions github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

Automated v5 β†’ v6 top-up (#7563, Track 7).

Carries 2 commit(s) from v5 onto v6.

This runs on every push to v5 (v5 only moves when a v4β†’v5 top-up or a v5 PR merges), plus a daily safety net, so v6 feature work never ages against a stale base.

Opened by .github/workflows/v6-topup.yml. If this merge conflicts the workflow fails instead of opening it β€” a conflicting forward-merge is a human decision (see #7199).

The Copilot usage sniff (crux/proxy/github_proxy_copilot.go) logs
"copilot sniff: upstream dial failed" at ERROR when it cannot reach the
*.githubcopilot.com host it is MITMing - e.g. a dial timeout to
telemetry.enterprise.githubcopilot.com. No log-fed class recognised the
line, so five in ten minutes opened an unclassified_error_repeated
self-report (#17262).

It is the same symptom as the opaque-tunnel "proxy: CONNECT dial
failed" (spoke cannot reach an agent-requested host), so count it under
proxy_connect_dial_failed (github-proxy, medium) with that class's
remedy. The regression row in TestRecurringRuntimeMessagesAreClassified
fails on the parent (LogFedClass returns "").

Fixes #17262

Hive-Run: #17262
Hive-Plan: selfreport-unclassified-error-classification
Hive-Spec: fleet-report#log-fed-classes

Signed-off-by: Karibhou <Karibhou@users.noreply.github.com>
Co-authored-by: Karibhou <Karibhou@users.noreply.github.com>
Co-authored-by: hivecommons-hive[bot] <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 8, 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 kellyaa 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 8, 2026
@github-actions

github-actions Bot commented Nov 8, 2026

Copy link
Copy Markdown
Contributor Author

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.

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

clubanderson and others added 2 commits November 8, 2026 14:26
The one document a new driver wires up from (RFC crux#114 order-of-work
item 7): S1β†’S7 composed end to end with curl and crux CLI forms, server
config keys and flags, control-token vs lane-principal auth, the
failure drills from the acceptance sections, a symptom β†’ saved-record
map, and what hive uses today vs. after the 2026-11-16 cutover. Linked
from the design record, the documentation map and the v5 integration
guide.

Part of hivecommons/crux#114

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Signed-off-by: hive-release[bot] <hive-release@hive.kubestellar.io>
@kubestellar-prow kubestellar-prow Bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 8, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

Diagnosis (hive scanner, read-only β€” nothing pushed; this branch is owned by the v6-topup workflow):

The only red check is the probot DCO app, and its evidence is not PR-local. It flags the two carried commits, which are already on v5 via squash merges:

A forward-merge carries v5 history verbatim, so rewriting those sign-offs here would diverge from v5 and re-conflict the next top-up; it is not a fix this PR can make. The repository's own required dco status is green ("Sign-off survives the squash" passes too) and mergeStateStatus is UNSTABLE (non-required check only). Precedent: #16688 merged with the identical probot DCO ACTION_REQUIRED.

Root cause sits upstream of this PR: squash merges on v5 take the sign-off from the PR body/commits while GitHub sets the author from the account's primary name/email. If this is worth closing, it is a v5 merge-policy question (require sign-off name/email to match the author before squash), not a repair of sync/v5-to-v6.

hive/awaiting-ci: all required checks green; merge is a maintainer/tide decision β€” sweep will merge when it is listed eligible.


🐝 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

Copy link
Copy Markdown
Contributor

Review follow-ups (below review.backlog.min_severity: P2)

Non-blocking findings below the backlog filing line are listed here instead of as issues, one comment per PR, updated in place. Tick them off as they are fixed; set review.backlog.min_severity: P3 to file every finding.

  • P3 low correctness β€” Sibling proxy upstream-dial log lines remain unclassified (src/crux/proxy/github_proxy_connect.go:541): The carried fix (πŸ› fleetreport: classify copilot sniff upstream dial failuresΒ #17263) adds only "copilot sniff: upstream dial failed" (src/crux/proxy/github_proxy_copilot.go:109) to ClassProxyConnectDialFailed at src/pkg/fleetreport/runtime.go:199. Two sibling…

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Hive status β€” updated in place; edits do not notify. Full history is in the Activity Monitor.

Hive filed review findings that do not block this PR as backlog items:

Cap: 3 backlog item(s) per PR.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Decision needed: @clubanderson should decide whether to set the DCO check to pass on this forward-merge (the two flagged commits are already on v5 with mismatched sign-off identities, as in previous top-ups) or let the next top-up supersede it.

The merge itself is sound; the only thing blocking it is DCO, and that cannot be fixed from this branch.

What I verified

  • Re-ran git merge --no-ff 155d51f12 onto a32447e2e (the two parents of head 0661c1b): the result is byte-identical to the PR head β€” zero diff. No manual edits were made during the merge.
  • Merging 0661c1b into current v6 (a11e466c5) produces no conflicts; the carried changes are src/pkg/fleetreport/runtime.go + test (#17263), the crux integration-guide docs (#17283) and their changelog fragment.
  • The merge commit carries its own Signed-off-by (the workflow uses --signoff, .github/workflows/v6-topup.yml:85-88).

Why DCO is red

The probot flags the two carried v5 squash commits, not the merge:

  • 155d51f β€” author Andy Anderson <andy@clubanderson.com>, sign-off Andrew Anderson <andy@clubanderson.com> (name differs)
  • c05ba93 β€” author Karibhou <157208370+Karibhou@users.noreply.github.com>, sign-off Karibhou <Karibhou@users.noreply.github.com> (email differs)

Both are already merged on v5; rewriting them here would make the forward-merge diverge from v5. Previous forward-merges landed as real merge commits (134a8c279, 84b42eabe), so this has presumably been overridden before. Note that the c05ba93 mismatch will recur on every forward-merge of that author's squashes until their local user.email matches the GitHub noreply address with the numeric prefix.

I have not changed anything on this PR.

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Needs a decision, not a merge:

  • the reviewer swarm returned requires_human @0661c1b
  • the review found: the reviewer marked this change high-risk
  • reviewer question: @clubanderson should decide whether to set the DCO check to pass on this forward-merge (the two flagged commits are already on v5 with mismatched sign-off identities, as in previous top-ups) or let the next top-up supersede it.
  • the automerge lane will not merge this unattended

Head: verdict requires_human @0661c1b, 70/70 checks green, DCO yes, soak 0s of 10m0s.

What to do: approve this head (0661c1b) 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.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Fix-before-new check (hive scanner) β€” nothing to push on sync/v5-to-v6.

The only red check is probot DCO, and it is non-blocking by documented policy: src/docs/native-merge-queue.md (#17030) replaces probot DCO for a github-actions[bot]-opened sync/v5-to-v6 β†’ v6 forward-merge with prow's dco status, because the flagged commits (c05ba93, 155d51f) are v5 history and cannot be re-signed PR-side without diverging from v5. native-queue-policy is SUCCESS on 0661c1b, every required check is green, and the two CANCELLED Sign-off survives the squash / verify PR contents jobs were cancel-in-progress casualties superseded by run 42515117856 (success).

Rewriting this branch into cherry-picks would break the top-up workflow's merge contract, so no force-push. What holds the PR is the stage-needs-decision verdict (reviewer requires_human) and tide β€” a maintainer decision, not a CI repair.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: 0661c1b72

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

@clubanderson

Copy link
Copy Markdown
Member

Superseded by #17290 (manual forward-merge of v5 d8b1d3a into v6, merged as a merge commit).

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

Labels

copilot 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants