Skip to content

ci(maintain-deploy): also discover LLM360-head PRs open against sgl-project/sglang#10

Merged
DavidBellamy merged 1 commit intollm360-mainfrom
ci/decouple-deploy-base-from-pr-discovery
Apr 19, 2026
Merged

ci(maintain-deploy): also discover LLM360-head PRs open against sgl-project/sglang#10
DavidBellamy merged 1 commit intollm360-mainfrom
ci/decouple-deploy-base-from-pr-discovery

Conversation

@DavidBellamy
Copy link
Copy Markdown
Collaborator

Why

The other 4 LLM360 forks (miles, harbor, smg, Megatron-LM) use their stabilized LLM360-friendly upstream (radixark, harbor-framework, lightseekorg) as BOTH the deploy reset base AND the source of open PRs with LLM360-owned heads. That pattern breaks for sglang: `sgl-project/sglang` moves very fast and does not contain our patch stack, so resetting deploy to it would wipe sglang-miles / TITO / MTP / rail-map every build.

The old self-referential workaround (`UPSTREAM=LLM360/sglang`) kept the reset correct but left a gap: upstream PRs the team authors against `sgl-project/sglang` (e.g. rail-map JSON passthrough in sgl-project#23003) don't land in our nightly image until they merge upstream. That blocked tonight's agentic RL pilots.

What this PR does

Decouples the two concerns by replacing `UPSTREAM` with two pairs:

Env var Role Value
`DEPLOY_BASE` + `DEPLOY_BASE_BRANCH` what we reset deploy to `LLM360/sglang:llm360-main`
`REAL_UPSTREAM` + `REAL_UPSTREAM_BRANCH` where we also query open PRs `sgl-project/sglang:main`

Deploy is built from:

  1. Reset to `DEPLOY_BASE:DEPLOY_BASE_BRANCH` (unchanged; preserves patch stack)
  2. Merge branches of open cross-fork PRs into `llm360-main` (unchanged)
  3. Merge branches of open fork-only PRs on `LLM360/sglang:llm360-main` (unchanged)
  4. NEW: merge branches of open PRs against `sgl-project/sglang:main` whose head repo is owned by LLM360

All discovered branches are still fetchable via `origin = LLM360/sglang` because the head branch always lives on the fork regardless of which base the PR targets.

Verification

After merge, the next maintain-deploy run will pick up open sgl-project PRs with LLM360 heads. Currently that set is only:

Which has already been landed manually via #9 to unblock tonight. After this workflow change, equivalent future upstream PRs flow in without manual mirroring.

…roject/sglang

The other 4 LLM360 forks (miles, harbor, smg, Megatron-LM) use their
stabilized LLM360-friendly upstream (radixark, harbor-framework,
lightseekorg) as BOTH the deploy reset base AND the source of open PRs
with LLM360-owned heads. That pattern breaks for sglang: sgl-project/
sglang moves very fast and does NOT contain our patch stack, so resetting
deploy to it would wipe sglang-miles/TITO/MTP/rail-map every build.

The old self-referential workaround (UPSTREAM=LLM360/sglang) kept the
reset correct but left a gap: upstream PRs the team authors against
sgl-project/sglang (e.g. rail-map JSON passthrough in sgl-project#23003) don't land
in our nightly image until they merge upstream. That block tonight's
agentic RL pilots.

Decouple the two concerns:

  - DEPLOY_BASE + DEPLOY_BASE_BRANCH = LLM360/sglang:llm360-main
    (what we reset to; contains our patch stack)
  - REAL_UPSTREAM + REAL_UPSTREAM_BRANCH = sgl-project/sglang:main
    (where we also query for open PRs with LLM360-owned heads)

Deploy = DEPLOY_BASE + cross-fork PRs into llm360-main + fork-local PRs
+ LLM360-head PRs open against sgl-project/sglang:main. Dedup by branch
name. Branches are all fetchable via origin=LLM360/sglang since the head
branch always lives there regardless of which base the PR points at.
@DavidBellamy DavidBellamy merged commit 0aa8b96 into llm360-main Apr 19, 2026
1 check passed
DavidBellamy added a commit that referenced this pull request Apr 19, 2026
…project#23003

Upstream PR sgl-project#23003 (fix/json-ib-device-passthrough) is
superseded by #9 (fix/json-ib-device-passthrough-llm360-main),
which mirrors the same 7-line patch on top of llm360-main. The upstream
branch was based on sgl-project/sglang:main and line-drifts when merged
into llm360-main — was triggering a merge conflict in every octopus run
after the PR #10 decouple landed.

Port harbor's SKIP_UPSTREAM_BRANCHES pattern: env var + jq `NOT_SKIPPED`
filter applied to both UPSTREAM_PR_STATE/BRANCHES (cross-fork PRs on
LLM360/sglang:llm360-main) and REAL_UPSTREAM_PR_STATE/BRANCHES (upstream
sgl-project/sglang PRs). Removes the skipped branch cleanly from the
state fingerprint too, so re-running doesn't see it as a pending change.
DavidBellamy added a commit that referenced this pull request Apr 19, 2026
…project#23003 (#11)

Upstream PR sgl-project#23003 (fix/json-ib-device-passthrough) is
superseded by #9 (fix/json-ib-device-passthrough-llm360-main),
which mirrors the same 7-line patch on top of llm360-main. The upstream
branch was based on sgl-project/sglang:main and line-drifts when merged
into llm360-main — was triggering a merge conflict in every octopus run
after the PR #10 decouple landed.

Port harbor's SKIP_UPSTREAM_BRANCHES pattern: env var + jq `NOT_SKIPPED`
filter applied to both UPSTREAM_PR_STATE/BRANCHES (cross-fork PRs on
LLM360/sglang:llm360-main) and REAL_UPSTREAM_PR_STATE/BRANCHES (upstream
sgl-project/sglang PRs). Removes the skipped branch cleanly from the
state fingerprint too, so re-running doesn't see it as a pending change.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant