diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index 19e1a35..46013d6 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -154,7 +154,14 @@ // { wip = nixpkgs.legacyPackages."${system}".symlinkJoin { name = "wip"; - paths = [ self.nixosConfigurations."odo".config.system.build.toplevel ]; + paths = + (builtins.map (name: self.nixosConfigurations."${name}".config.system.build.toplevel) [ + "odo" + "odowork" + "quark" + "family_disks" + ]) + ++ [ self.packages."${system}".hydra.vm_iso ]; }; } ) diff --git a/nix/configuration/roles/hydra/default.nix b/nix/configuration/roles/hydra/default.nix index f447784..8945697 100644 --- a/nix/configuration/roles/hydra/default.nix +++ b/nix/configuration/roles/hydra/default.nix @@ -81,6 +81,7 @@ in let enabled_targets = [ "wip" + "wip_kubernetes" "odo" "odo_update" "odowork" diff --git a/nix/configuration/roles/hydra/files/nix_builder.toml b/nix/configuration/roles/hydra/files/nix_builder.toml index 869286f..a494c47 100644 --- a/nix/configuration/roles/hydra/files/nix_builder.toml +++ b/nix/configuration/roles/hydra/files/nix_builder.toml @@ -7,6 +7,13 @@ output_directory = "/home/nixworker/persist/nix_builder" path = "nix/configuration" attr = "wip" +[[targets]] + name = "wip_kubernetes" + repo = "https://code.fizz.buzz/talexander/machine_setup.git" + branch = "wip" + path = "nix/kubernetes" + attr = "wip" + [[targets]] name = "odo" repo = "https://code.fizz.buzz/talexander/machine_setup.git" diff --git a/nix/kubernetes/flake.nix b/nix/kubernetes/flake.nix index 2567ea5..d3c5966 100644 --- a/nix/kubernetes/flake.nix +++ b/nix/kubernetes/flake.nix @@ -149,10 +149,11 @@ // { wip = nixpkgs.legacyPackages."${system}".symlinkJoin { name = "wip"; - paths = [ - self.nixosConfigurations."controller0".config.system.build.toplevel - self.nixosConfigurations."worker0".config.system.build.toplevel - ]; + paths = ( + builtins.map (name: self.nixosConfigurations."${name}".config.system.build.toplevel) ( + builtins.attrNames self.nixosConfigurations + ) + ); }; } )