tests deploy: cleanup

This commit is contained in:
lassulus 2017-12-31 04:14:30 +01:00
parent 76e1b56c84
commit 9ee5c02e75

View File

@ -42,15 +42,12 @@ let
cd ${<stockholm>} cd ${<stockholm>}
export NIX_PATH=stockholm=${<stockholm>}:nixpkgs=${<nixpkgs>}:$NIX_PATH export NIX_PATH=stockholm=${<stockholm>}:nixpkgs=${<nixpkgs>}:$NIX_PATH
exec >&2 exec >&2
: ${minimalSystem}
source=${pkgs.writeJSON "source.json" populate-source} source=${pkgs.writeJSON "source.json" populate-source}
cat > /tmp/derp <<EOF
builtins.fromJSON (builtins.readFile "$source")
EOF
LOGNAME=krebs ${pkgs.populate}/bin/populate --force root@server:22/var/src/ < "$source" LOGNAME=krebs ${pkgs.populate}/bin/populate --force root@server:22/var/src/ < "$source"
# TODO: make deploy work
#LOGNAME=krebs ${pkgs.stockholm}/bin/deploy \ #LOGNAME=krebs ${pkgs.stockholm}/bin/deploy \
# --force-populate \ # --force-populate \
# --source=/tmp/derp \ # --source=${./data/test-source.nix} \
# --system=server \ # --system=server \
''; '';
minimalSystem = (import <nixpkgs/nixos/lib/eval-config.nix> { minimalSystem = (import <nixpkgs/nixos/lib/eval-config.nix> {
@ -71,22 +68,20 @@ in {
imports = [ test-config ]; imports = [ test-config ];
environment.variables = { environment.variables = {
NIX_PATH = mkForce "nixpkgs=${<nixpkgs>}"; NIX_PATH = mkForce "nixpkgs=${<nixpkgs>}";
#LOL = minimalSystem;
}; };
services.openssh.enable = true; services.openssh.enable = true;
users.extraUsers.root.openssh.authorizedKeys.keys = [ users.extraUsers.root.openssh.authorizedKeys.keys = [
pubKey pubKey
]; ];
#virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ virtualisation.pathsInNixDB = [
minimalSystem minimalSystem
pkgs.stockholm
]; ];
environment.systemPackages = [ pkgs.git ];
}; };
client = client =
{ config, pkgs, ... }: { }; { config, pkgs, ... }:
{ };
}; };
testScript = '' testScript = ''