docs: the swarm-builder status gates the merge now, and no promise about rebasing a PR branch
This commit is contained in:
parent
2ea8c9de60
commit
5814f177c8
3 changed files with 9 additions and 7 deletions
|
|
@ -191,7 +191,8 @@ metrics it exports and the threat model:
|
||||||
The swarm builder, in a `swarm-builder` container on the host that sets
|
The swarm builder, in a `swarm-builder` container on the host that sets
|
||||||
`deploy.builder.enable`; set it to `false` to opt out. It evaluates and builds
|
`deploy.builder.enable`; set it to `false` to opt out. It evaluates and builds
|
||||||
unreviewed agent config PRs, and the result shows as a `swarm-builder` commit
|
unreviewed agent config PRs, and the result shows as a `swarm-builder` commit
|
||||||
status on the PR. A red status blocks nothing: the merge still deploys. It also
|
status on the PR. The status is required: a red or missing one blocks the
|
||||||
|
merge. It also
|
||||||
builds each agent before the swarm sends its deploy, and a failed build holds
|
builds each agent before the swarm sends its deploy, and a failed build holds
|
||||||
that deploy back. The jobs show on the swarm UI's Jobs page. It builds through
|
that deploy back. The jobs show on the swarm UI's Jobs page. It builds through
|
||||||
its host's nix daemon, so it costs real CPU and disk.
|
its host's nix daemon, so it costs real CPU and disk.
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,8 @@ status has no link.
|
||||||
host's store until it's collected, so on a host that also runs the hive, the
|
host's store until it's collected, so on a host that also runs the hive, the
|
||||||
hive's own build can reuse whatever matches. A [meta build](#deploy-gate)
|
hive's own build can reuse whatever matches. A [meta build](#deploy-gate)
|
||||||
can push to [a binary cache](#binary-cache).
|
can push to [a binary cache](#binary-cache).
|
||||||
- The PR check gates nothing. A merge deploys whatever the status says. The
|
- The PR check gates the merge: `swarm-builder` is a required status on every
|
||||||
|
config repo's `main`, so a red or missing status blocks it. The
|
||||||
[deploy gate](#deploy-gate) is a separate build, from `internal/meta`.
|
[deploy gate](#deploy-gate) is a separate build, from `internal/meta`.
|
||||||
- A lost webhook delivery of a PR push isn't retried: the head isn't built until the next
|
- A lost webhook delivery of a PR push isn't retried: the head isn't built until the next
|
||||||
push. The jobs graph is in memory, so a controller restart drops a build in
|
push. The jobs graph is in memory, so a controller restart drops a build in
|
||||||
|
|
@ -712,8 +713,8 @@ swarm-controller queues a `build_agent` job. Jobs run one at a time, and a
|
||||||
newer push replaces its PR's job while that job is still waiting. The builder
|
newer push replaces its PR's job while that job is still waiting. The builder
|
||||||
builds that config at the PR's head on the agent base its own host runs,
|
builds that config at the PR's head on the agent base its own host runs,
|
||||||
through the host's nix daemon, and swarm-controller writes the result as a `swarm-builder`
|
through the host's nix daemon, and swarm-controller writes the result as a `swarm-builder`
|
||||||
commit status on the head. The job shows on the swarm UI's Jobs page. A red
|
commit status on the head. The job shows on the swarm UI's Jobs page. The
|
||||||
status blocks nothing: the merge still deploys.
|
status is required on `main`: a red or missing one blocks the merge.
|
||||||
|
|
||||||
Separately, the builder builds each agent from `internal/meta` before the swarm
|
Separately, the builder builds each agent from `internal/meta` before the swarm
|
||||||
sends its deploy, and a failed or unpushed build holds that deploy back (`build_meta` job;
|
sends its deploy, and a failed or unpushed build holds that deploy back (`build_meta` job;
|
||||||
|
|
|
||||||
|
|
@ -397,9 +397,9 @@ one per hive. It ensures them at start and every five minutes after
|
||||||
commit status has to pass before a merge, and no other status is
|
commit status has to pass before a merge, and no other status is
|
||||||
required. The controller leaves a repo with no `main` rule alone;
|
required. The controller leaves a repo with no `main` rule alone;
|
||||||
- the merge settings of every `agent-configs` repo: fast-forward-only is
|
- the merge settings of every `agent-configs` repo: fast-forward-only is
|
||||||
the default merge style, and rebase stays on, so an operator can rebase
|
the default merge style, and the rebase merge style stays allowed. The
|
||||||
an out-of-date PR branch onto `main`. The other merge styles stay as the
|
other merge styles stay as the repo has them, and the rule's blocking of
|
||||||
repo has them;
|
out-of-date branches stays as it was;
|
||||||
- the pull-mirrors from `deploy.forgejo.mirrors` on the controller's
|
- the pull-mirrors from `deploy.forgejo.mirrors` on the controller's
|
||||||
host (with the `actions/checkout` and `actions/upload-artifact` ones
|
host (with the `actions/checkout` and `actions/upload-artifact` ones
|
||||||
`deploy.forgejo.actionsFromSelf` adds, and `hyperhive/hyperhive` from
|
`deploy.forgejo.actionsFromSelf` adds, and `hyperhive/hyperhive` from
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue