the-distro/infra
9
0
Fork 5
Code Issues 39 Pull requests 8 Packages Projects 1 Releases Wiki Activity

Compare commits

base: the-distro:830dcbf6bc745bb154b1d8e5703f78134489eb5f
Branches Tags
the-distro:main
the-distro:ofborg
the-distro:revert-to-bash
the-distro:vault
the-distro:storage-project
the-distro:block-crawlers
the-distro:fix-buildbot
the-distro:lukegb/rule-94
the-distro:cache-lix
the-distro:build02-lix
the-distro:lukegb/uptime-kuma-root
the-distro:hydra-metrics
the-distro:builder
the-distro:email-groups
the-distro:cache-ipv4
the-distro:format
the-distro:hexchen/colmena-checker
the-distro:hexy/credentials
the-distro:buildbot
the-distro:ckie/moarr-v4
the-distro:gerrit-metrics
the-distro:moar-builders
the-distro:unplug-epyc
the-distro:hydra-wire-up
the-distro:alertmanager
the-distro:fodwatch
the-distro:cadvisor-containers
the-distro:gerrit-http-clones
the-distro:meta01
..
compare: the-distro:93822775a96b8c94ca462dd6361fcce8de9c6521
Branches Tags
the-distro:main
the-distro:ofborg
the-distro:revert-to-bash
the-distro:vault
the-distro:storage-project
the-distro:block-crawlers
the-distro:fix-buildbot
the-distro:lukegb/rule-94
the-distro:cache-lix
the-distro:build02-lix
the-distro:lukegb/uptime-kuma-root
the-distro:hydra-metrics
the-distro:builder
the-distro:email-groups
the-distro:cache-ipv4
the-distro:format
the-distro:hexchen/colmena-checker
the-distro:hexy/credentials
the-distro:buildbot
the-distro:ckie/moarr-v4
the-distro:gerrit-metrics
the-distro:moar-builders
the-distro:unplug-epyc
the-distro:hydra-wire-up
the-distro:alertmanager
the-distro:fodwatch
the-distro:cadvisor-containers
the-distro:gerrit-http-clones
the-distro:meta01

No commits in common. "830dcbf6bc745bb154b1d8e5703f78134489eb5f" and "93822775a96b8c94ca462dd6361fcce8de9c6521" have entirely different histories.
830dcbf6bc ... 93822775a9

3 changed files with 27 additions and 32 deletions
Show stats Expand all files Collapse all files

12
flake.lock
View file

@ -258,17 +258,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722688238, "lastModified": 1721682989,
"narHash": "sha256-x6BnYtArF6IDs7bS8ExokgAQBOlrxXxD0EOBIlASmfM=", "narHash": "sha256-kjJiZ7m4HKqbZ2mxNQiB32/goKFb8BRi8OqC4wIU0OI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "9b5ac87de73ea4646dbb2af979db91f096d29960", "rev": "4b107e6ff36bd89958fba36e0fe0340903e7cd13",
"revCount": 4191, "revCount": 4190,
"type": "git", "type": "git",
"url": "https://git.lix.systems/the-distro/hydra.git" "url": "https://git.lix.systems/lix-project/hydra.git"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.lix.systems/the-distro/hydra.git" "url": "https://git.lix.systems/lix-project/hydra.git"
} }
}, },
"lix": { "lix": {

2
flake.nix
View file

@ -11,7 +11,7 @@
colmena.url = "github:zhaofengli/colmena"; colmena.url = "github:zhaofengli/colmena";
colmena.inputs.nixpkgs.follows = "nixpkgs"; colmena.inputs.nixpkgs.follows = "nixpkgs";
hydra.url = "git+https://git.lix.systems/the-distro/hydra.git"; hydra.url = "git+https://git.lix.systems/lix-project/hydra.git";
hydra.inputs.nixpkgs.follows = "nixpkgs"; hydra.inputs.nixpkgs.follows = "nixpkgs";
nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git"; nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git";

45
services/baremetal-builder/default.nix
View file

@ -55,34 +55,29 @@ in
boot.initrd.services.lvm.enable = true; boot.initrd.services.lvm.enable = true;
fileSystems."/" = {
device = "/dev/disk/by-label/root";
fsType = "xfs";
};
fileSystems."/mnt" = {
device = "/dev/disk/by-label/hydra";
fsType = "xfs";
options = ["logbsize=256k"];
};
boot.kernel.sysctl."fs.xfs.xfssyncd_centisecs" = "12000"; boot.kernel.sysctl."fs.xfs.xfssyncd_centisecs" = "12000";
fileSystems = lib.mkMerge [
{
"/" = {
device = "/dev/disk/by-label/root";
fsType = "xfs";
};
"/boot" = { # We want the tmp filesystem on the same filesystem as the hydra store, so that builds can use reflinks
device = "/dev/disk/by-label/BOOT"; fileSystems."/tmp" = {
fsType = "vfat"; device = "/mnt/tmp";
options = [ "fmask=0022" "dmask=0022" ]; options = [ "bind" ];
}; };
}
(lib.mkIf (!cfg.netboot) {
"/mnt" = {
device = "/dev/disk/by-label/hydra";
fsType = "xfs";
options = ["logbsize=256k"];
};
# We want the tmp filesystem on the same filesystem as the hydra store, so that builds can use reflinks fileSystems."/boot" = {
"/tmp" = { device = "/dev/disk/by-label/BOOT";
device = "/mnt/tmp"; fsType = "vfat";
options = [ "bind" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
})
];
swapDevices = lib.optionals (!cfg.netboot) [ swapDevices = lib.optionals (!cfg.netboot) [
{ {