ci: small-runner lane + per-ref concurrency (queue starvation fix)
- build & docs-reminder jobs -> runs-on: small (dedicated small-jobs runner, server-management#574). Gitea dispatches a job as a runner task even when its 'if' skips it; the PR-run skip of 'Build & push image' waited up to 31 min for an ubuntu-latest slot, stalling every PR run. - concurrency scoped per event+ref with cancel-in-progress for PRs: runs parallelize across PRs, superseded syncs auto-cancel. Previously one global group serialized ALL runs (single-runner relic). Main/tag builds still serialize within their ref; don't push main + v* tag simultaneously (shared :buildcache / smoke container) — tag after main is green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -22,11 +22,15 @@ on:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
# Single runner on jazz: serialize all runs so the push-main-then-tag release
|
||||
# flow can't collide on the shared :buildcache tag or the smoke container.
|
||||
# Concurrency is scoped per ref (originally one global group for the single
|
||||
# jazz runner; with 3 runners that serialized the whole queue). PR runs
|
||||
# parallelize across PRs and a new sync auto-cancels its superseded run.
|
||||
# Real image builds (main / v* tags) still serialize within their own ref;
|
||||
# don't push main and a v* tag simultaneously — they share :buildcache and
|
||||
# the smoke container name.
|
||||
concurrency:
|
||||
group: ersatztv-build
|
||||
cancel-in-progress: false
|
||||
group: ersatztv-build-${{ github.event_name }}-${{ github.ref }}
|
||||
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
|
||||
|
||||
env:
|
||||
REGISTRY: 192.168.1.95:3000
|
||||
@@ -180,7 +184,12 @@ jobs:
|
||||
|
||||
build:
|
||||
name: Build & push image (amd64)
|
||||
runs-on: ubuntu-latest
|
||||
# `small` = the dedicated small-jobs runner lane (server-management#574).
|
||||
# On PR runs this job only resolves its skip, but Gitea still dispatches it
|
||||
# as a task — on the ubuntu-latest runners that skip queued behind long
|
||||
# builds (observed 31 min). Real builds (main/tags) run on bumblebee,
|
||||
# capped at 4 CPUs / 10g.
|
||||
runs-on: small
|
||||
needs: [test, migrations]
|
||||
if: github.event_name != 'pull_request'
|
||||
steps:
|
||||
@@ -306,7 +315,7 @@ jobs:
|
||||
# cache-save issues seen on the relocated runner (server-management#570).
|
||||
docs-reminder:
|
||||
name: Docs update reminder
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: small # seconds-long git diff; keep it off the build runners
|
||||
if: github.event_name == 'pull_request'
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
+15
-5
@@ -44,11 +44,21 @@ non-blocking `docs-reminder` job runs on PRs only (see below).
|
||||
never `:latest` — enforced in the prod compose (server-management#481). `:prod` is
|
||||
only produced by pushing a `v*` tag.
|
||||
|
||||
`concurrency: { group: ersatztv-build, cancel-in-progress: false }` serializes all
|
||||
runs — the single runner (`ci-runner`, VM 127 on pve4 `192.168.1.127`; relocated off
|
||||
bumblebee/jazz in server-management#570 so CI no longer starves prod media playback)
|
||||
can't safely run the push-`main`-then-push-`v*`
|
||||
release flow in parallel (shared `:buildcache` tag, shared smoke container).
|
||||
Concurrency is scoped **per event+ref** (`group: ersatztv-build-${{ github.event_name }}-${{ github.ref }}`,
|
||||
`cancel-in-progress` for PRs): PR runs parallelize across PRs, a new sync auto-cancels
|
||||
its superseded run, and image builds still serialize within their own ref. Do NOT push
|
||||
`main` and a `v*` tag simultaneously — those are separate groups but share the
|
||||
`:buildcache` tag and the smoke container name; tag only after the main build is green.
|
||||
(History: originally one global group serializing ALL runs for the single runner —
|
||||
with three runners that starved the queue; changed 2026-07-11, server-management#574.)
|
||||
|
||||
Three runners serve the fork (server-management#570/#574): `ci-runner` (VM 127 pve4,
|
||||
`ubuntu-latest`, 2 slots), `bumblebee-runner` (bumblebee, `ubuntu-latest`, 2 slots,
|
||||
jobs capped `--cpus=4 --memory=10g` so CI can't starve prod media playback), and
|
||||
`small-runner` (bumblebee, label **`small`**, 4 slots) — the small-jobs lane. The
|
||||
`build` and `docs-reminder` jobs use `runs-on: small`: Gitea dispatches a job as a
|
||||
runner task even when its `if` skips it, and those skip-tasks used to wait behind
|
||||
long builds (observed 31 min) stalling every PR run.
|
||||
|
||||
### `test` job
|
||||
|
||||
|
||||
Reference in New Issue
Block a user