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

Jump to bottom

hydra: switch to fork #1349

Merged
merged 3 commits into from
Sep 16, 2024
Merged

hydra: switch to fork #1349

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
a9a2e46
modules/nixos/hydra: evaluator settings
zowoq Aug 9, 2024
fb080f5
modules/nixos/hydra: fix hydra-compress-logs
zowoq Sep 15, 2024
33b7602
hydra: switch to fork
zowoq Jul 6, 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
18 changes: 18 additions & 0 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
flake-compat.url = "github:nix-community/flake-compat";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts";
hydra.flake = false;
hydra.url = "github:qowoz/hydra/community";
Copy link
Member

@Mic92 Mic92 Aug 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Should we just ask for commit access and get those commits in upstream?
We can probably even test them on the actual NixOS hydra, the current infra team is looking for help anyway.

Copy link
Contributor Author

@zowoq zowoq Aug 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Almost all of them have been deployed on hydra.nixos.org for a while and are in various upstream branches / PRs.

Copy link
Member

@Mic92 Mic92 Aug 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

cc @zimbatm @Ericson2314 @dasJ

Copy link
Member

Choose a reason for hiding this comment

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

@zowoq even more a reason to just merge them into the hydra branch. I ask for access.

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'm also looking at picking the lix patches that replace hydra-eval-jobs with nix-eval-jobs. Would need to pick a couple their patches for nix-eval-jobs as well.

Copy link
Member

@Mic92 Mic92 Aug 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@zowoq if I would look at this, would you be ok, if we run the result on nix-community infra?

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'm happy to pick patches from a upstream PR if that is what you mean?

Copy link
Member

Choose a reason for hiding this comment

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

I mean, I would need to test patches as well in a non-trivial setup and do fixes as needed. Local testing of demo instances only take you so far.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For that I'd suggest deploying another hydra instance on build01.

Copy link
Member

Choose a reason for hiding this comment

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

I was hoping we could test hydra changes together, but in that case I could also look for a different project where I can deploy a hydra.

lite-config.url = "github:yelite/lite-config";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
nix-darwin.url = "github:LnL7/nix-darwin";
Expand Down Expand Up @@ -61,6 +63,15 @@
{
nixpkgs = {
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "terraform" ];
overlays = [
(final: prev: {
hydra = (prev.hydra.override { nix = final.nixVersions.nix_2_22; }).overrideAttrs (o: {
version = inputs.hydra.shortRev;
src = inputs.hydra;
buildInputs = o.buildInputs ++ [ final.perlPackages.DBIxClassHelpers ];
});
})
];
};

hostModuleDir = ./hosts;
Expand Down
4 changes: 4 additions & 0 deletions modules/nixos/hydra.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@
port = 3000;
useSubstitutes = true;
extraConfig = ''
evaluator_max_memory_size = 4096
evaluator_workers = 8
max_concurrent_evals = 2
max_output_size = ${builtins.toString (8 * 1024 * 1024 * 1024)}
compress_build_logs_compression = bzip2
'';
};

Expand Down