Merge remote-tracking branch 'lass/master'

3 files changed, 22 insertions, 10 deletions

diff --git a/krebs/2configs/binary-cache/prism.nix b/krebs/2configs/binary-cache/prism.nix
new file mode 100644
index 00000000..4813eeb0
--- /dev/null
+++ b/krebs/2configs/binary-cache/prism.nix
@@ -0,0 +1,12 @@
+{ config, ... }:
+
+{
+  nix = {
+    binaryCaches = [
+      "http://cache.prism.r"
+    ];
+    binaryCachePublicKeys = [
+      "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
+    ];
+  };
+}
diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix
index fe982c87..acd806d6 100644
--- a/krebs/2configs/buildbot-all.nix
+++ b/krebs/2configs/buildbot-all.nix
@@ -1,8 +1,13 @@
 { lib, config, pkgs, ... }:
 {
   imports = [
-    <stockholm/krebs/2configs/buildbot-krebs.nix>
+    <stockholm/krebs/2configs/repo-sync.nix>
   ];
+
+  networking.firewall.allowedTCPPorts = [ 80 8010 9989 ];
+  krebs.ci.enable = true;
+  krebs.ci.treeStableTimer = 1;
+  krebs.ci.users.krebs.all = true;
   krebs.ci.users.lass.all = true;
   krebs.ci.users.makefu.all = true;
   krebs.ci.users.nin.all = true;
diff --git a/krebs/2configs/buildbot-krebs.nix b/krebs/2configs/buildbot-krebs.nix
index 7f243b50..40ca3c66 100644
--- a/krebs/2configs/buildbot-krebs.nix
+++ b/krebs/2configs/buildbot-krebs.nix
@@ -6,13 +6,8 @@
 
   networking.firewall.allowedTCPPorts = [ 80 8010 9989 ];
   krebs.ci.enable = true;
-  krebs.ci.users.krebs ={
-    all = true;
-    hosts = [
-      "test-arch"
-      "test-centos6"
-      "test-centos7"
-      "test-all-krebs-modules"
-    ];
-  };
+  krebs.ci.treeStableTimer = 120;
+  krebs.ci.users.krebs.hosts = [
+    config.networking.hostName
+  ];
 }