MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #235972 (fix Taskserver test)

Browse source 
I'm merging this without review, since the tests run by ofborg are
succeeding. In addition to that, it's fixing a currently broken test so
the worst that could happen is that the test still does not work.
This commit is contained in:
aszlig 2023-06-06 17:55:22 +02:00
commit c14dac6f25
No known key found for this signature in database
GPG key ID: 684089CE67EBB691
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nixos/tests/taskserver.nix
View file

@ -69,23 +69,14 @@ in {
testOrganisation.users = [ "alice" "foo" ]; testOrganisation.users = [ "alice" "foo" ];
anotherOrganisation.users = [ "bob" ]; anotherOrganisation.users = [ "bob" ];
}; };
};
# New generation of the server with manual config specialisation.manual-config.configuration = {
newServer = { lib, nodes, ... }: { services.taskserver.pki.manual = {
imports = [ server ]; ca.cert = snakeOil.cacert;
services.taskserver.pki.manual = { server.cert = snakeOil.cert;
ca.cert = snakeOil.cacert; server.key = snakeOil.key;
server.cert = snakeOil.cert; server.crl = snakeOil.crl;
server.key = snakeOil.key; };
server.crl = snakeOil.crl;
};
# This is to avoid assigning a different network address to the new
# generation.
networking = lib.mapAttrs (lib.const lib.mkForce) {
interfaces.eth1.ipv4 = nodes.server.config.networking.interfaces.eth1.ipv4;
inherit (nodes.server.config.networking)
hostName primaryIPAddress extraHosts;
}; };
}; };
@ -103,7 +94,8 @@ in {
testScript = { nodes, ... }: let testScript = { nodes, ... }: let
cfg = nodes.server.config.services.taskserver; cfg = nodes.server.config.services.taskserver;
portStr = toString cfg.listenPort; portStr = toString cfg.listenPort;
newServerSystem = nodes.newServer.config.system.build.toplevel; specialisations = "${nodes.server.system.build.toplevel}/specialisation";
newServerSystem = "${specialisations}/manual-config";
switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test"; switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test";
in '' in ''
from shlex import quote from shlex import quote