From bc6191454133e4e72413479ab9f6ee122010f6d9 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 30 May 2021 16:57:22 +0200 Subject: flake.nix: fmt --- flake.nix | 134 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 68 insertions(+), 66 deletions(-) diff --git a/flake.nix b/flake.nix index faf9ead..3006e5b 100644 --- a/flake.nix +++ b/flake.nix @@ -124,79 +124,81 @@ }; }; - hydraJobs = let - testing = import (nixpkgs + "/nixos/lib/testing-python.nix") { system = "x86_64-linux"; }; - in { - - tests.testDefault = testing.simpleTest { - machine = self.nixosModules.test; - testScript = '' - # TODO - machine.wait_for_unit("multi-user.target") - ''; - }; + hydraJobs = + let + testing = import (nixpkgs + "/nixos/lib/testing-python.nix") { system = "x86_64-linux"; }; + in + { + + tests.testDefault = testing.simpleTest { + machine = self.nixosModules.test; + testScript = '' + # TODO + machine.wait_for_unit("multi-user.target") + ''; + }; - tests.testPlainDesktop = testing.simpleTest { - machine = { ... }: { - imports = [ - self.nixosModules.test - self.nixosModules.profiles.desktop - self.nixosModules.usecases.common.fwupd - ]; + tests.testPlainDesktop = testing.simpleTest { + machine = { ... }: { + imports = [ + self.nixosModules.test + self.nixosModules.profiles.desktop + self.nixosModules.usecases.common.fwupd + ]; + }; + testScript = '' + # TODO + machine.wait_for_unit("multi-user.target") + ''; }; - testScript = '' - # TODO - machine.wait_for_unit("multi-user.target") - ''; - }; - tests.testDevDesktop = testing.simpleTest { - machine = { ... }: { - imports = [ - self.nixosModules.test - self.nixosModules.profiles.desktop - self.nixosModules.usecases.common.fwupd - self.nixosModules.usecases.desktop.development - ]; + tests.testDevDesktop = testing.simpleTest { + machine = { ... }: { + imports = [ + self.nixosModules.test + self.nixosModules.profiles.desktop + self.nixosModules.usecases.common.fwupd + self.nixosModules.usecases.desktop.development + ]; + }; + testScript = '' + # TODO + machine.wait_for_unit("multi-user.target") + ''; }; - testScript = '' - # TODO - machine.wait_for_unit("multi-user.target") - ''; - }; - tests.testServer = testing.simpleTest { - machine = { ... }: { - imports = [ - self.nixosModules.test - self.nixosModules.profiles.server - self.nixosModules.usecases.server.ankisyncd - self.nixosModules.usecases.server.gotifyServer - self.nixosModules.usecases.server.hydraServer - self.nixosModules.usecases.server.radicale - self.nixosModules.usecases.server.zfs - - { - # Needed for ZFS - networking.hostId = "4e98920d"; - - services.hydra = { - hydraURL = "localhost:3000"; - notificationSender = "hydra@localhost"; - secretKeyLocation = builtins.toFile - "secret-key" - "testServer:0d5jJjOxIoe6sTr2YKWkQxsM3ZcW+9GAk52yYNVxfYBUxS2nUfzfQk5Jo0OwHnT95bTLXCVNQETGV4m6KHsVCA=="; - }; - } - ]; + tests.testServer = testing.simpleTest { + machine = { ... }: { + imports = [ + self.nixosModules.test + self.nixosModules.profiles.server + self.nixosModules.usecases.server.ankisyncd + self.nixosModules.usecases.server.gotifyServer + self.nixosModules.usecases.server.hydraServer + self.nixosModules.usecases.server.radicale + self.nixosModules.usecases.server.zfs + + { + # Needed for ZFS + networking.hostId = "4e98920d"; + + services.hydra = { + hydraURL = "localhost:3000"; + notificationSender = "hydra@localhost"; + secretKeyLocation = builtins.toFile + "secret-key" + "testServer:0d5jJjOxIoe6sTr2YKWkQxsM3ZcW+9GAk52yYNVxfYBUxS2nUfzfQk5Jo0OwHnT95bTLXCVNQETGV4m6KHsVCA=="; + }; + } + ]; + }; + testScript = '' + # TODO + machine.wait_for_unit("multi-user.target") + ''; }; - testScript = '' - # TODO - machine.wait_for_unit("multi-user.target") - ''; - }; - }; + }; }; } -- cgit v1.2.3