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

Separate machine specific x86 builder configuration from the common one #58

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Separate machine specific x86 builder configuration from the common one #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions hosts/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
inherit specialArgs;
modules = [./monitoring/configuration.nix];
};
ficolobuild = lib.nixosSystem {
ficolobuild3 = lib.nixosSystem {
inherit specialArgs;
modules = [./ficolobuild/configuration.nix];
modules = [./ficolobuild/build3.nix];
};
prbuilder = lib.nixosSystem {
inherit specialArgs;
Expand Down
25 changes: 25 additions & 0 deletions hosts/ficolobuild/build3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
# SPDX-License-Identifier: Apache-2.0
#
{
self,
lib,
...
}: {
imports = lib.flatten [
(with self.nixosModules; [
user-themisto
user-barna
])
./builder.nix
];

# build3 specific configuration

networking.hostName = "build3";

# Trust Themisto Hydra user
nix.settings = {
trusted-users = ["root" "themisto" "barna"];
};
}
6 changes: 0 additions & 6 deletions hosts/ficolobuild/configuration.nix → hosts/ficolobuild/builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
user-hrosten
user-jrautiola
user-mkaapu
user-themisto
user-tervis
user-karim
user-mika
Expand All @@ -42,9 +41,4 @@
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

# Trust Themisto Hydra user
nix.settings = {
trusted-users = ["root" "themisto"];
};
}
4 changes: 2 additions & 2 deletions tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
# SPDX-FileCopyrightText: 2023 Nix community projects
#
# SPDX-License-Identifier: MIT
Expand Down Expand Up @@ -86,7 +86,7 @@ class TargetHost:
),
"build3-ficolo": TargetHost(
hostname="172.18.20.104",
nixosconfig="ficolobuild",
nixosconfig="ficolobuild3",
),
"prbuilder": TargetHost(
hostname="172.18.20.106",
Expand Down
Loading