diff options
| author | lassulus <lass@blue.r> | 2018-09-07 17:30:31 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-09-07 17:30:31 +0200 |
| commit | f8a594cff85af8e19fa3aa7e6159004105285142 (patch) | |
| tree | 1f7f85ad942114798e4c38b558982f9c2cb3fc2a | |
| parent | c667b2c66407f2daf67c635ca429858fa80c5dab (diff) | |
buildbot-stockholm: use krops.nix
| -rw-r--r-- | krebs/2configs/buildbot-stockholm.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix index 1ed38f54f..13d4c6729 100644 --- a/krebs/2configs/buildbot-stockholm.nix +++ b/krebs/2configs/buildbot-stockholm.nix @@ -4,6 +4,14 @@ let hostname = config.networking.hostName; + build = pkgs.writeDash "build" '' + set -eu + export USER="$1" + export SYSTEM="$2" + $(nix-build $USER/krops.nix --no-out-link --argstr name "$SYSTEM" --argstr target "$HOME/stockholm-build" -A ci) + ''; + + in { networking.firewall.allowedTCPPorts = [ 80 ]; @@ -95,15 +103,9 @@ in env={ "NIX_PATH": "secrets=/var/src/stockholm/null:stockholm=./:/var/src", "NIX_REMOTE": "daemon", - "dummy_secrets": "true", }, command=[ - "nix-shell", "-I", "stockholm=.", "--run", " ".join(["test", - "--user={}".format(user), - "--system={}".format(host), - "--force-populate", - "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user), - ]) + "${build}", user, host ], timeout=90001, workdir='build', # TODO figure out why we need this? |