Merge remote-tracking branch 'prism/master'

4 files changed, 45 insertions, 22 deletions

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 6d26ff89a..dce7dae40 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -16,7 +16,7 @@ in {
     systemWide = true;
   };
 
-  users.extraUsers.mainUser.extraGroups = [ "audio" ];
+  users.extraUsers.mainUser.extraGroups = [ "audio" "video" ];
 
   time.timeZone = "Europe/Berlin";
 
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 766fd715e..90a990339 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -8,9 +8,6 @@ let
     ControlPath /tmp/%u_sshmux_%r@%h:%p
     ControlPersist 4h
   '';
-  sshWrapper = pkgs.writeDash "ssh-wrapper" ''
-    ${pkgs.openssh}/bin/ssh -F ${sshHostConfig} -i ${shell.escape config.lass.build-ssh-privkey.path} "$@"
-  '';
 
 in {
   config.krebs.buildbot.master = let
@@ -66,10 +63,15 @@ in {
         "NIX_REMOTE": "daemon",
         "dummy_secrets": "true",
       }
+      env_shared = {
+        "LOGNAME": "shared",
+        "NIX_REMOTE": "daemon",
+        "dummy_secrets": "true",
+      }
 
       # prepare nix-shell
       # the dependencies which are used by the test script
-      deps = [ "gnumake", "jq", "nix", "(import <stockholm>).pkgs.populate" ]
+      deps = [ "gnumake", "jq", "nix", "(import <stockholm>).pkgs.populate", "openssh" ]
       # TODO: --pure , prepare ENV in nix-shell command:
       #                   SSL_CERT_FILE,LOGNAME,NIX_REMOTE
       nixshell = ["nix-shell",
@@ -88,20 +90,20 @@ in {
         for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
           addShell(f,name="build-{}".format(i),env=env_lass,
                   command=nixshell + \
-                      ["make \
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
                             test \
-                            ssh=${sshWrapper} \
-                            target=build@localhost${config.users.users.build.home}/testbuild \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
                             method=build \
                             system={}".format(i)])
 
         for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
           addShell(f,name="build-{}".format(i),env=env_makefu,
                   command=nixshell + \
-                      ["make \
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
                             test \
-                            ssh=${sshWrapper} \
-                            target=build@localhost${config.users.users.build.home}/testbuild \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
                             method=build \
                             system={}".format(i)])
 
@@ -114,19 +116,35 @@ in {
       fast-tests = ''
         f = util.BuildFactory()
         f.addStep(grab_repo)
-        for i in [ "prism", "mors", "echelon" ]:
-          addShell(f,name="populate-{}".format(i),env=env_lass,
+        for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
+          addShell(f,name="build-{}".format(i),env=env_lass,
+                  command=nixshell + \
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
+                            test \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
+                            method=eval \
+                            system={}".format(i)])
+
+        for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
+          addShell(f,name="build-{}".format(i),env=env_makefu,
                   command=nixshell + \
-                            ["{}(make system={} populate debug=true)".format("!" if "failing" in i else "",i)])
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
+                            test \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
+                            method=eval \
+                            system={}".format(i)])
 
-        addShell(f,name="build-test-minimal",env=env_lass,
+        for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf" ]:
+          addShell(f,name="build-{}".format(i),env=env_shared,
                   command=nixshell + \
-                            ["nix-instantiate \
-                                  --show-trace --eval --strict --json \
-                                  -I nixos-config=./shared/1systems/test-minimal-deploy.nix  \
-                                  -I secrets=. \
-                                  -A config.system.build.toplevel"]
-                )
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
+                            test \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
+                            method=eval \
+                            system={}".format(i)])
 
         bu.append(util.BuilderConfig(name="fast-tests",
               slavenames=slavenames,
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 622ef1185..dbb2a853a 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -44,6 +44,11 @@ with config.krebs.lib;
         };
       };
     }
+    {
+      environment.variables = {
+        NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
+      };
+    }
   ];
 
   networking.hostName = config.krebs.build.host.name;
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index b758bc24a..576447542 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
       url = https://github.com/lassulus/nixpkgs;
-      ref = "c6ca9c8c8b7eb8f8e68868e36fb90e162adf080f";
+      ref = "a75c0d9342ecb86dedd11f61a4e6f59ecc42d151";
     };
 }