Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s 2 buildbot: use new nixpkgs compat structure

Browse Source
This commit is contained in:
makefu 2016-02-15 20:14:31 +01:00
parent a1a307d764
commit 8a88dbe173
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
shared/2configs/shared-buildbot.nix
View File

@ -69,7 +69,7 @@
# SSL_CERT_FILE,LOGNAME,NIX_REMOTE # SSL_CERT_FILE,LOGNAME,NIX_REMOTE
nixshell = ["nix-shell", nixshell = ["nix-shell",
"-I", "stockholm=.", "-I", "stockholm=.",
"-I", "nixpkgs=/var/src/upstream-nixpkgs", "-I", "nixpkgs=/var/src/nixpkgs",
"-p" ] + deps + [ "--run" ] "-p" ] + deps + [ "--run" ]
# prepare addShell function # prepare addShell function
@ -90,21 +90,21 @@
addShell(f,name="instantiate-test-all-modules",env=env, addShell(f,name="instantiate-test-all-modules",env=env,
command=nixshell + \ command=nixshell + \
["touch retiolum.rsa_key.priv; \ ["touch retiolum.rsa_key.priv; \
nix-instantiate --eval -A \ nix-instantiate \
users.shared.test-all-krebs-modules.system \ --show-trace --eval --strict --json \
-I stockholm=. \ -I nixos-config=./shared/1systems/test-all-krebs-modules.nix \
--show-trace \ -I secrets=. \
-I secrets=. '<stockholm>' \ -A config.system.build.toplevel"]
--strict --json"]) )
addShell(f,name="instantiate-test-minimal-deploy",env=env, addShell(f,name="build-test-minimal",env=env,
command=nixshell + \ command=nixshell + \
["nix-instantiate --eval -A \ ["nix-instantiate \
users.shared.test-minimal-deploy.system \ --show-trace --eval --strict --json \
-I stockholm=. \ -I nixos-config=./shared/1systems/test-minimal-deploy.nix \
-I secrets=. '<stockholm>' \ -I secrets=. \
--show-trace \ -A config.system.build.toplevel"]
--strict --json"]) )
bu.append(util.BuilderConfig(name="fast-tests", bu.append(util.BuilderConfig(name="fast-tests",
slavenames=slavenames, slavenames=slavenames,
@ -151,6 +151,6 @@
packages = with pkgs;[ git nix ]; packages = with pkgs;[ git nix ];
# all nix commands will need a working nixpkgs installation # all nix commands will need a working nixpkgs installation
extraEnviron = { extraEnviron = {
NIX_PATH="nixpkgs=/var/src/upstream-nixpkgs:nixos-config=./shared/1systems/wolf.nix"; }; NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./shared/1systems/wolf.nix"; };
}; };
} }