From 426022f656fff789148dc988a585858f8212b252 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 29 Jul 2017 02:20:03 +0200
Subject: krebs ci: set default of build all hosts to false

---
 krebs/3modules/ci.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules/ci.nix')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 6e4db6edd..31517a23d 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -13,7 +13,7 @@ in
         options = {
           all = mkOption {
             type = bool;
-            default = true;
+            default = false;
           };
           hosts = mkOption {
             type = listOf str;
-- 
cgit v1.3.1


From f0470d32957d7c83145bf26ea50350095fe7eb53 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 29 Jul 2017 11:51:29 +0200
Subject: krebs ci: don't automatically garbage collect

---
 krebs/3modules/ci.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'krebs/3modules/ci.nix')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 31517a23d..1f8dc71e0 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -48,9 +48,6 @@ in
       };
     };
 
-    nix.gc.automatic = true;
-    nix.gc.dates = "05:23";
-
     krebs.buildbot.master = {
       slaves = {
         testslave = "lasspass";
-- 
cgit v1.3.1


From 35784d80d241163c02eb4dc56f2aa45acd3510c1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 30 Jul 2017 19:05:55 +0200
Subject: krebs buildbot: add treeStableTimer as option

---
 krebs/2configs/buildbot-all.nix   | 1 +
 krebs/2configs/buildbot-krebs.nix | 1 +
 krebs/3modules/ci.nix             | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'krebs/3modules/ci.nix')

diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix
index 59f948218..acd806d6e 100644
--- a/krebs/2configs/buildbot-all.nix
+++ b/krebs/2configs/buildbot-all.nix
@@ -6,6 +6,7 @@
 
   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;
diff --git a/krebs/2configs/buildbot-krebs.nix b/krebs/2configs/buildbot-krebs.nix
index 1acfbe506..40ca3c66d 100644
--- a/krebs/2configs/buildbot-krebs.nix
+++ b/krebs/2configs/buildbot-krebs.nix
@@ -6,6 +6,7 @@
 
   networking.firewall.allowedTCPPorts = [ 80 8010 9989 ];
   krebs.ci.enable = true;
+  krebs.ci.treeStableTimer = 120;
   krebs.ci.users.krebs.hosts = [
     config.networking.hostName
   ];
diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 1f8dc71e0..f64c28d25 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -8,6 +8,11 @@ in
 {
   options.krebs.ci = {
     enable = mkEnableOption "krebs continous integration";
+    treeStableTimer = mkOption {
+      type = types.int;
+      default = 10;
+      description = "how long to wait until we test changes (in minutes)";
+    };
     users = mkOption {
       type = with types; attrsOf (submodule {
         options = {
@@ -69,7 +74,7 @@ in
           sched.append(
                 schedulers.SingleBranchScheduler(
                     change_filter=util.ChangeFilter(branch_re=".*"),
-                    treeStableTimer=10,
+                    treeStableTimer=${toString cfg.treeStableTimer}*60,
                     name="build-all-branches",
                     builderNames=[
                         "build-hosts"
-- 
cgit v1.3.1


From af1073f52ac5346ab102ea493b4941c2e895a647 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 31 Jul 2017 12:25:53 +0200
Subject: krebs ci: raise timeout to 90001

---
 krebs/3modules/ci.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'krebs/3modules/ci.nix')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index f64c28d25..71e7d4aeb 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -124,7 +124,8 @@ in
                       "--force-populate",
                       "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user),
                     ])
-                  ]
+                  ],
+                  timeout=90001
               )
 
           ${let
-- 
cgit v1.3.1