diff options
| author | lassulus <lass@aidsballs.de> | 2016-07-18 12:15:50 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-07-18 12:15:50 +0200 |
| commit | e3d48fa10b365f438558c1e65c137aa2a74a29f6 (patch) | |
| tree | ac8ded827ad4dbf8bf43e0909b958dc0ecbbd8b3 /shared/2configs/shared-buildbot.nix | |
| parent | 1d56fb06212a27b3ddd59e3616b5acee036fa5fd (diff) | |
| parent | 642335e4306b79c626332dab67a157016e230ee6 (diff) | |
Merge remote-tracking branch 'gum/master' into new-populate
Diffstat (limited to 'shared/2configs/shared-buildbot.nix')
| -rw-r--r-- | shared/2configs/shared-buildbot.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 6c40d99..688f8f9a 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -75,7 +75,8 @@ # prepare nix-shell # the dependencies which are used by the test script - deps = [ "gnumake", "jq","nix","rsync", + deps = [ "gnumake", "jq", "nix", + "(import <stockholm>).pkgs.populate", "(import <stockholm>).pkgs.test.infest-cac-centos7" ] # TODO: --pure , prepare ENV in nix-shell command: # SSL_CERT_FILE,LOGNAME,NIX_REMOTE @@ -95,8 +96,7 @@ for i in [ "test-centos7", "wolf", "test-failing" ]: addShell(f,name="populate-{}".format(i),env=env, command=nixshell + \ - ["{}( make system={} eval.config.krebs.build.populate \ - | jq -er .)".format("!" if "failing" in i else "",i)]) + ["{}(make system={} populate debug=true)".format("!" if "failing" in i else "",i)]) # XXX we must prepare ./retiolum.rsa_key.priv for secrets to work addShell(f,name="instantiate-test-all-modules",env=env, @@ -179,7 +179,7 @@ masterhost = "localhost"; username = "testslave"; password = "krebspass"; - packages = with pkgs;[ git nix gnumake jq rsync ]; + packages = with pkgs; [ gnumake jq nix populate ]; # all nix commands will need a working nixpkgs installation extraEnviron = { NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./shared/1systems/wolf.nix"; }; |