Draft
Conversation
Mic92
force-pushed
the
staging-hydra
branch
2 times, most recently
from
64208c6 to
8140196
Compare
Member
Author
|
Depends on #1009 |
The ofborg machines were maintained in a separate NixOS/ofborg-infrastructure repo that already consumed this one as a flake input for shared modules and ssh-keys. Keeping two repos in lockstep created drift and double-locking, so fold the ofborg NixOS hosts (core01, eval01-04, build01-05) into non-critical-infra and the five MacStadium darwin builders into macs/. References to inputs.infra are rewritten to local relative paths now that the indirection is gone. The ofborg and ofborg-viewer flakes become direct inputs so the ofborg builders and core services keep evaluating unchanged. The ofborg hosts are registered in colmena alongside the existing non-critical machines so a single hive covers everything. The hydra builders on these hosts now use inputs.hydra-staging (NixOS/hydra) instead of the helsinki-systems/hydra-queue-runner fork (incorporating NixOS/ofborg-infrastructure#18), so client and server are built from the same tree. The duplicated per-host services.queue-builder-dev / sops blocks are factored into non-critical-infra/modules/hydra/builder.nix. Secrets are copied verbatim with their sops creation rules and host age keys merged into the existing .sops.yaml files; cole-h's ssh and age keys are dropped while at it. CI gains per-architecture ofborg jobs that build all hosts of one arch in a single nix-fast-build run via a new ciSystems flake output, since the fleet shares almost its entire closure and splitting per host would rebuild it repeatedly.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
NixOS/hydra#1659