diff options
author | makefu <github@syntax-fehler.de> | 2016-07-18 12:15:10 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-07-18 12:15:10 +0200 |
commit | 33c96a89c5c72218a1c9f16bcea5909cd5135768 (patch) | |
tree | 065d79ba654a2e53e3b837b9f7e14987ed94e99a /lass/2configs/buildbot-standalone.nix | |
parent | d9028c51320d29d8ed15dff7a9fb7a3eb16f52ff (diff) | |
parent | e2157dade8a359f81b1e6260f3c9c6e8d36360e5 (diff) |
Merge 'cd/master'
Diffstat (limited to 'lass/2configs/buildbot-standalone.nix')
-rw-r--r-- | lass/2configs/buildbot-standalone.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 04bdcf9d8..4c63d857c 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -64,7 +64,7 @@ in { # prepare nix-shell # the dependencies which are used by the test script - deps = [ "gnumake", "jq", "nix", "rsync", "proot" ] + deps = [ "gnumake", "jq", "nix", "(import <stockholm>).pkgs.populate" ] # TODO: --pure , prepare ENV in nix-shell command: # SSL_CERT_FILE,LOGNAME,NIX_REMOTE nixshell = ["nix-shell", @@ -112,8 +112,7 @@ in { for i in [ "prism", "mors", "echelon" ]: addShell(f,name="populate-{}".format(i),env=env_lass, 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)]) addShell(f,name="build-test-minimal",env=env_lass, command=nixshell + \ @@ -146,7 +145,7 @@ in { masterhost = "localhost"; username = "testslave"; password = "lasspass"; - packages = with pkgs;[ git nix gnumake jq rsync ]; + packages = with pkgs; [ gnumake jq nix populate ]; extraEnviron = { NIX_PATH="nixpkgs=/var/src/nixpkgs"; }; |