Merge remote-tracking branch 'prism/master'

7 files changed, 92 insertions, 30 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 1db3ffd1f..12a5a7365 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
@@ -47,8 +44,8 @@ in {
         sched.append(schedulers.SingleBranchScheduler(
                                     change_filter=util.ChangeFilter(branch_re=".*"),
                                     treeStableTimer=10,
-                                    name="prism-all-branches",
-                                    builderNames=["build-all"]))
+                                    name="build-all-branches",
+                                    builderNames=["build-all", "build-pkgs"]))
       '';
     };
     builder_pre = ''
@@ -74,7 +71,7 @@ in {
 
       # 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",
@@ -93,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,7 +111,7 @@ in {
               slavenames=slavenames,
               factory=f))
 
-            '';
+      '';
 
       fast-tests = ''
         f = util.BuildFactory()
@@ -122,37 +119,94 @@ 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=eval \
                             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=eval \
                             system={}".format(i)])
 
-        for i in [ "test-minimal-deploy" ]:
+        for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf" ]:
           addShell(f,name="build-{}".format(i),env=env_shared,
                   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=eval \
                             system={}".format(i)])
 
         bu.append(util.BuilderConfig(name="fast-tests",
               slavenames=slavenames,
               factory=f))
+      '';
+      build-pkgs = ''
+        f = util.BuildFactory()
+        f.addStep(grab_repo)
+        for i in [
+          "apt-cacher-ng",
+          "bepasty-client-cli",
+          "cac-api",
+          "cac-cert",
+          "cac-panel",
+          "charybdis",
+          "collectd-connect-time",
+          "dic",
+          "drivedroid-gen-repo",
+          "exim",
+          "fortclientsslvpn",
+          "get",
+          "git-hooks",
+          "github-hosts-sync",
+          "go",
+          "hashPassword",
+          "haskellPackages.blessings",
+          "haskellPackages.email-header",
+          "haskellPackages.megaparsec",
+          "haskellPackages.scanner",
+          "haskellPackages.xmonad-stockholm",
+          "krebspaste",
+          "krebszones",
+          "logf",
+          "much",
+          "newsbot-js",
+          "noVNC",
+          "passwdqc-utils",
+          "populate",
+          "posix-array",
+          "pssh",
+          "push",
+          "Reaktor",
+          "realwallpaper",
+          "repo-sync",
+          "retiolum-bootstrap",
+          "tarantool",
+          "test",
+          "tinc_graphs",
+          "translate-shell",
+          "urlwatch",
+          "vncdotool",
+          "with-tmpdir",
+          "youtube-tools",
+        ]:
+          addShell(f,name="build-{}".format(i),env=env_lass,
+                  command=nixshell + \
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make system=prism pkgs.{}".format(i)])
 
+        bu.append(util.BuilderConfig(name="build-pkgs",
+              slavenames=slavenames,
+              factory=f))
             '';
     };
     enable = true;
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/downloading.nix b/lass/2configs/downloading.nix
index 597d20721..a6de7c581 100644
--- a/lass/2configs/downloading.nix
+++ b/lass/2configs/downloading.nix
@@ -15,10 +15,11 @@ in {
       extraGroups = [
         "download"
       ];
-      openssh.authorizedKeys.keys = [
-        config.krebs.users.lass.pubkey
-        config.krebs.users.lass-uriel.pubkey
-        config.krebs.users.lass-shodan.pubkey
+      openssh.authorizedKeys.keys = with config.krebs.users; [
+        lass.pubkey
+        lass-uriel.pubkey
+        lass-shodan.pubkey
+        makefu.pubkey
       ];
     };
 
diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix
index ff5698e4e..9988e788f 100644
--- a/lass/2configs/mpv.nix
+++ b/lass/2configs/mpv.nix
@@ -28,6 +28,9 @@ let
   good = moveToDir "G" "./.good";
   delete = moveToDir "D" "./.graveyard";
 
+  up = moveToDir "U" "./up";
+  down = moveToDir "Y" "./down";
+
   deleteCurrentTrack = pkgs.writeText "delete.lua" ''
     deleted_tmp = "./.graveyard"
 
diff --git a/lass/2configs/newsbot-js.nix b/lass/2configs/newsbot-js.nix
index f2b70d831..46ff3fbf9 100644
--- a/lass/2configs/newsbot-js.nix
+++ b/lass/2configs/newsbot-js.nix
@@ -159,7 +159,6 @@ let
     torrentfreak|http://feeds.feedburner.com/Torrentfreak|#news
     torr_news|http://feed.torrentfreak.com/Torrentfreak/|#news
     travel_warnings|http://feeds.travel.state.gov/ca/travelwarnings-alerts|#news
-    #truther|http://truthernews.wordpress.com/feed/|#news
     un_afr|http://www.un.org/apps/news/rss/rss_africa.asp|#news
     un_am|http://www.un.org/apps/news/rss/rss_americas.asp|#news
     un_eu|http://www.un.org/apps/news/rss/rss_europe.asp|#news
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";
     };
 }