Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules/nixos/buildbot: add pullBased repo microvm.nix #1598

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

modules/nixos/buildbot: add pullBased repo microvm.nix #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca75539
Revert "terraform/hydra-projects: add microvm.nix"
zowoq Dec 6, 2024
3d96702
modules/nixos/buildbot: add pullBased repo microvm.nix
zowoq Dec 6, 2024
d58f537
test
zowoq Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions modules/nixos/buildbot.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ in
sops.secrets.buildbot-nix-workers = { };
sops.secrets.cachix-auth-token = { };

services.buildbot-nix.master.pullBased = {
pollInterval = 1800;
repositories = {
"astro/microvm.nix" = {
url = "https://github.com/qowoz/microvm.nix.git";
defaultBranch = "main";
};
Comment on lines +31 to +34
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"astro/microvm.nix" = {
url = "https://github.com/qowoz/microvm.nix.git";
defaultBranch = "main";
};
"astro/microvm.nix" = {
url = "https://github.com/qowoz/microvm.nix.git";
defaultBranch = "main";
evalWorkerCount = 4;
};

@Mic92 Could we make evalWorkerCount configurable per repo? This repo uses a lot of memory and I really don't want to have to reduce it just for one repo.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zowoq sounds doable and useful. Please open an issue. We have most of the code needed for this to happen already there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found it was easy to add it as a config file option so for now I'll use that: nix-community/buildbot-nix@2d039c3

Unfortunately found other problems. Even with just 8 workers it still uses a lot of memory, too much considering that we other jobs running. Also very slow to eval, after 20 minutes it hasn't even finished aarch64-linux, it'll block jobs other repos. Not sure if we'd want change the current eval lock to something like a per repo eval lock and limit the buildbot instance to 2 concurrent evals.

Copy link
Member

@Mic92 Mic92 Jan 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How many virtual machines does this have?
@astro are you sharing nixpkgs instances in your microvm machines tests. Do you disable documentation? Are you applying many overlays?
Maybe we also need to make configurable what it evaluates i.e. only a single architecture.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can easily get the test matrix above 128 tests. It's all individual flake check entries but the nixpkgs are pinned through flake.lock. microvm.nix overlay only.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hyperfine -r 5 'nix-eval-jobs --workers 1 --force-recurse --flake github:astro/microvm.nix#hydraJobs.x86_64-linux.crosvm-startup-shutdown'

Benchmark 1: nix-eval-jobs --workers 1 --force-recurse --flake github:astro/microvm.nix#hydraJobs.x86_64-linux.crosvm-startup-shutdown
  Time (mean ± σ):     91.982 s ±  0.193 s    [User: 54.372 s, System: 25.974 s]
  Range (min … max):   91.669 s … 92.138 s    5 runs

hyperfine -r 5 'nix-eval-jobs --workers 1 --force-recurse --flake github:astro/microvm.nix#hydraJobs.aarch64-linux.qemu-9pstore-overlay-shutdown-command'

Benchmark 1: nix-eval-jobs --workers 1 --force-recurse --flake github:astro/microvm.nix#hydraJobs.aarch64-linux.qemu-9pstore-overlay-shutdown-command
  Time (mean ± σ):     92.361 s ±  0.502 s    [User: 54.808 s, System: 26.118 s]
  Range (min … max):   91.557 s … 92.925 s    5 runs

};
};

services.buildbot-nix.master = {
enable = true;
admins = [
Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/common/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
./security.nix
./sops-nix.nix
./telegraf.nix
./update.nix
#./update.nix
./users.nix
inputs.srvos.nixosModules.server
];
Expand Down
27 changes: 0 additions & 27 deletions terraform/hydra-projects.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,30 +69,3 @@ resource "hydra_project" "simple_nixos_mailserver" {
value = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver"
}
}

resource "hydra_project" "microvm_nix" {
name = "microvm-nix"
display_name = "MicroVM.nix"
description = "NixOS MicroVMs"
homepage = "https://github.com/astro/microvm.nix"
owner = "admin"
enabled = true
visible = true
}

resource "hydra_jobset" "microvm_nix" {
project = hydra_project.microvm_nix.name
state = "disabled"
visible = true
name = "main"
type = "flake"
description = "main branch"

flake_uri = "github:astro/microvm.nix"

check_interval = 1800
scheduling_shares = 3000
keep_evaluations = 1

email_notifications = false
}
Loading