From 14d1655deb456d6be95463af2ca1524f7a1b7a98 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 16:30:01 +0100
Subject: s 1 test-centos7: prepare for ci

---
 shared/1systems/test-centos7.nix    | 3 ++-
 shared/2configs/base.nix            | 4 ++--
 shared/2configs/temp/dirs.nix       | 1 +
 shared/2configs/temp/networking.nix | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 shared/2configs/temp/dirs.nix
 create mode 100644 shared/2configs/temp/networking.nix

(limited to 'shared')

diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix
index 077a5d61..48cecc87 100644
--- a/shared/1systems/test-centos7.nix
+++ b/shared/1systems/test-centos7.nix
@@ -7,7 +7,8 @@ in {
   imports = [
     ../2configs/base.nix
     ../2configs/os-templates/CAC-CentOS-7-64bit.nix
-    ../2configs/os-templates/temp-networking.nix
+    ../2configs/temp/networking.nix
+    ../2configs/temp/dirs.nix
   ];
 
   sound.enable = false;
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index df41eae1..fceea67d 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -20,11 +20,11 @@ with lib;
     };
     dir.secrets = {
       host = config.krebs.current.host;
-      path = "${getEnv "HOME"}/secrets/krebs/wolf";
+      path = mkDefault "${getEnv "HOME"}/secrets/krebs/wolf";
     };
     dir.stockholm = {
       host = config.krebs.current.host;
-      path = "${getEnv "HOME"}/stockholm";
+      path = mkDefault "${getEnv "HOME"}/stockholm";
     };
   };
 
diff --git a/shared/2configs/temp/dirs.nix b/shared/2configs/temp/dirs.nix
new file mode 100644
index 00000000..958608a5
--- /dev/null
+++ b/shared/2configs/temp/dirs.nix
@@ -0,0 +1 @@
+_: { }
diff --git a/shared/2configs/temp/networking.nix b/shared/2configs/temp/networking.nix
new file mode 100644
index 00000000..958608a5
--- /dev/null
+++ b/shared/2configs/temp/networking.nix
@@ -0,0 +1 @@
+_: { }
-- 
cgit v1.2.3


From 9ec4c5df3d132db078e89cb577860b6ec416be04 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 16:42:28 +0100
Subject: s 2 base: fix user,pubkey,secrets path

---
 shared/2configs/base.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index fceea67d..c36061e3 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -13,6 +13,8 @@ with lib;
     ];
   };
 
+  # TODO rename shared user to "krebs"
+  krebs.build.user = config.krebs.users.shared;
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
@@ -20,7 +22,7 @@ with lib;
     };
     dir.secrets = {
       host = config.krebs.current.host;
-      path = mkDefault "${getEnv "HOME"}/secrets/krebs/wolf";
+      path = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
     };
     dir.stockholm = {
       host = config.krebs.current.host;
@@ -65,7 +67,7 @@ with lib;
     config.krebs.users.lass.pubkey
     config.krebs.users.makefu.pubkey
     # TODO HARDER:
-    (readFile ../../krebs/Zpubkeys/makefu_omo.ssh.pub)
+    config.krebs.users.makefu-omo.pubkey
     config.krebs.users.tv.pubkey
   ];
 
-- 
cgit v1.2.3


From c26ba8d7e674a02995ae613327208f4d9771546b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 18:53:53 +0100
Subject: m 2 base: build user defaults to shared

---
 shared/1systems/wolf.nix | 2 --
 shared/2configs/base.nix | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'shared')

diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 2c51ac8f..fba4bd9b 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -33,8 +33,6 @@ in
   # uninteresting stuff
   #####################
   krebs.build.host = config.krebs.hosts.wolf;
-  # TODO rename shared user to "krebs"
-  krebs.build.user = config.krebs.users.shared;
   krebs.build.target = "wolf";
 
   boot.kernel.sysctl = {
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index c36061e3..0ce33655 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -14,7 +14,7 @@ with lib;
   };
 
   # TODO rename shared user to "krebs"
-  krebs.build.user = config.krebs.users.shared;
+  krebs.build.user = mkDefault config.krebs.users.shared;
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
-- 
cgit v1.2.3


From bf1b6482ce3535ef7e7b3f77879def12ff454c0c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 19:36:19 +0100
Subject: mv makefu->krebs 3 buildbot

---
 shared/1systems/wolf.nix                |  2 +-
 shared/2configs/buildbot-standalone.nix | 31 +++++++++++++++++++++++++++++++
 shared/2configs/cac-ci.nix              | 11 -----------
 3 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 shared/2configs/buildbot-standalone.nix
 delete mode 100644 shared/2configs/cac-ci.nix

(limited to 'shared')

diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index fba4bd9b..f05356f0 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -11,7 +11,7 @@ in
     ../2configs/collectd-base.nix
     ../2configs/shack-nix-cacher.nix
     ../2configs/shack-drivedroid.nix
-    ../2configs/cac-ci.nix
+    ../2configs/buildbot-standalone.nix
     ../2configs/graphite.nix
   ];
   # use your own binary cache, fallback use cache.nixos.org (which is used by
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
new file mode 100644
index 00000000..adf44cad
--- /dev/null
+++ b/shared/2configs/buildbot-standalone.nix
@@ -0,0 +1,31 @@
+{ lib, config, pkgs, ... }:
+let
+    pkgs-unst = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
+in {
+  nixpkgs.config.packageOverrides = pkgs: {
+    buildbot = pkgs-unst.buildbot;
+    buildbot-slave = pkgs-unst.buildbot-slave;
+  };
+  networking.firewall.allowedTCPPorts = [ 8010 ];
+  krebs.buildbot.master = {
+    enable = true;
+    irc = {
+      enable = true;
+      server = "cd.retiolum";
+      channel = "retiolum";
+      allowForce = true;
+    };
+    extraConfig = ''
+      c['buildbotURL']  = "http://${config.krebs.build.host.name}:8010/"
+    '';
+  };
+
+  krebs.buildbot.slave = {
+    enable = true;
+    masterhost = "localhost";
+    username = "testslave";
+    password = "krebspass";
+    packages = with pkgs;[ git nix ];
+    extraEnviron = { NIX_PATH="nixpkgs=${toString <nixpkgs>}"; };
+  };
+}
diff --git a/shared/2configs/cac-ci.nix b/shared/2configs/cac-ci.nix
deleted file mode 100644
index 06cce274..00000000
--- a/shared/2configs/cac-ci.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-{
-  environment.systemPackages = with pkgs;[
-    get
-    cac
-    cacpanel
-    jq
-  ];
-}
-- 
cgit v1.2.3


From 9de08634c0718363a9ff7ee5c3a6825a4a4a7d9c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 22:00:30 +0100
Subject: s 1 test-failing: add for CI

---
 shared/1systems/test-failing.nix | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 shared/1systems/test-failing.nix

(limited to 'shared')

diff --git a/shared/1systems/test-failing.nix b/shared/1systems/test-failing.nix
new file mode 100644
index 00000000..81a9e48d
--- /dev/null
+++ b/shared/1systems/test-failing.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+
+{
+  programs.ssh.startAgent = true;
+  programs.ssh.startAgent = false;
+}
-- 
cgit v1.2.3


From 3adf78473d2deff0b991d7222e928fa2888529f6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 24 Dec 2015 00:02:59 +0100
Subject: k 3 buildbot.master: refactor

see buildbot-standalone.nix in shared/2configs for the current buildbot config
---
 shared/2configs/buildbot-standalone.nix | 107 ++++++++++++++++++++++++++++++--
 1 file changed, 103 insertions(+), 4 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index adf44cad..baab059c 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -8,16 +8,115 @@ in {
   };
   networking.firewall.allowedTCPPorts = [ 8010 ];
   krebs.buildbot.master = {
+    slaves = {
+      testslave =  "krebspass";
+      testslave2 = "krebspass";
+    };
+    change_source.stockholm = ''
+  stockholm_repo = 'http://cgit.gum/stockholm'
+  cs.append(changes.GitPoller(
+          stockholm_repo,
+          workdir='stockholm-poller', branch='master',
+          project='stockholm',
+          pollinterval=120))
+    '';
+    scheduler = {
+        force-scheduler = ''
+  sched.append(schedulers.ForceScheduler(
+                              name="force",
+                              builderNames=["full-tests"]))
+        '';
+        fast-tests-scheduler = ''
+  # test the master real quick
+  sched.append(schedulers.SingleBranchScheduler(
+                              change_filter=util.ChangeFilter(branch="master"),
+                              name="fast-master-test",
+                              builderNames=["fast-tests"]))
+        '';
+        full-master-scheduler = ''
+  # files everyone depends on or are part of the share branch
+  def shared_files(change):
+    r =re.compile("^((krebs|shared)/.*|Makefile|default.nix)")
+    for file in change.files:
+      if r.match(file):
+        return True
+    return False
+
+  sched.append(schedulers.SingleBranchScheduler(
+                              change_filter=util.ChangeFilter(branch="master"),
+                              fileIsImportant=shared_files,
+                              name="full-master-test",
+                              builderNames=["full-tests"]))
+        '';
+    };
+    builder_pre = ''
+  # prepare grab_repo step for stockholm
+  stockholm_repo = "http://cgit.gum.retiolum/stockholm"
+  grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental')
+
+  env = {"LOGNAME": "shared", "NIX_REMOTE": "daemon"}
+
+  # prepare nix-shell
+  # the dependencies which are used by the test script
+  deps = [ "gnumake", "jq","nix","rsync",
+            "(import <stockholm> {}).pkgs.test.infest-cac-centos7" ]
+  # TODO: --pure , prepare ENV in nix-shell command:
+  #                   SSL_CERT_FILE,LOGNAME,NIX_REMOTE
+  nixshell = ["nix-shell", "-I", "stockholm=.", "-p" ] + deps + [ "--run" ]
+
+  # prepare addShell function
+  def addShell(factory,**kwargs):
+    factory.addStep(steps.ShellCommand(**kwargs))
+    '';
+    builder = {
+      fast-tests = ''
+  f = util.BuildFactory()
+  f.addStep(grab_repo)
+  addShell(f,name="centos7-eval",env=env,
+            command=nixshell + ["make -s eval get=krebs.deploy filter=json system=test-centos7"])
+
+  addShell(f,name="wolf-eval",env=env,
+            command=nixshell + ["make -s eval get=krebs.deploy filter=json system=wolf"])
+
+  addShell(f,name="eval-cross-check",env=env,
+            command=nixshell + ["! make eval get=krebs.deploy filter=json system=test-failing"])
+
+  bu.append(util.BuilderConfig(name="fast-tests",
+        slavenames=slavenames,
+        factory=f))
+      '';
+      slow-tests = ''
+  s = util.BuildFactory()
+  s.addStep(grab_repo)
+
+  # slave needs 2 files:
+  # * cac.json
+  # * retiolum
+  for file in ["cac.json", "retiolum.rsa_key.priv"]:
+    s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/{}".format(file),
+                            slavedest=file))
+
+  addShell(s, name="infest-cac-centos7",env=env,
+              sigtermTime=60,           # SIGTERM 1 minute before SIGKILL
+              timeout=5400,             # 1.5h timeout
+              command=nixshell + ["infest-cac-centos7"])
+
+  bu.append(util.BuilderConfig(name="full-tests",
+        slavenames=slavenames,
+        factory=s))
+      '';
+    };
     enable = true;
+    web = {
+      enable = true;
+    };
     irc = {
       enable = true;
+      nick = "shared-buildbot";
       server = "cd.retiolum";
-      channel = "retiolum";
+      channels = [ "retiolum" ];
       allowForce = true;
     };
-    extraConfig = ''
-      c['buildbotURL']  = "http://${config.krebs.build.host.name}:8010/"
-    '';
   };
 
   krebs.buildbot.slave = {
-- 
cgit v1.2.3


From 1ff8d0b8c5c6f631d71408eeff61778d90f9789f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 24 Dec 2015 20:50:23 +0100
Subject: s 2 buildbot: add treestabletimer

---
 shared/2configs/base.nix                | 2 ++
 shared/2configs/buildbot-standalone.nix | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 0ce33655..4d509d7a 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -19,6 +19,7 @@ with lib;
     git.nixpkgs = {
       url = https://github.com/NixOS/nixpkgs;
       rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80";
+      target-path = "/var/src/nixpkgs";
     };
     dir.secrets = {
       host = config.krebs.current.host;
@@ -27,6 +28,7 @@ with lib;
     dir.stockholm = {
       host = config.krebs.current.host;
       path = mkDefault "${getEnv "HOME"}/stockholm";
+      target-path = "/var/src/stockholm";
     };
   };
 
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index baab059c..51c60032 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -6,11 +6,11 @@ in {
     buildbot = pkgs-unst.buildbot;
     buildbot-slave = pkgs-unst.buildbot-slave;
   };
-  networking.firewall.allowedTCPPorts = [ 8010 ];
+  networking.firewall.allowedTCPPorts = [ 8010 9989 ];
   krebs.buildbot.master = {
     slaves = {
       testslave =  "krebspass";
-      testslave2 = "krebspass";
+      omo = "krebspass";
     };
     change_source.stockholm = ''
   stockholm_repo = 'http://cgit.gum/stockholm'
@@ -33,7 +33,7 @@ in {
                               name="fast-master-test",
                               builderNames=["fast-tests"]))
         '';
-        full-master-scheduler = ''
+        test-cac-infest-master = ''
   # files everyone depends on or are part of the share branch
   def shared_files(change):
     r =re.compile("^((krebs|shared)/.*|Makefile|default.nix)")
@@ -45,6 +45,7 @@ in {
   sched.append(schedulers.SingleBranchScheduler(
                               change_filter=util.ChangeFilter(branch="master"),
                               fileIsImportant=shared_files,
+                              treeStableTimer=60*60, # master was stable for the last hour
                               name="full-master-test",
                               builderNames=["full-tests"]))
         '';
-- 
cgit v1.2.3


From d574c0ef78f7572aec88e484d3ff6256247e878c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 30 Dec 2015 01:38:33 +0100
Subject: m 3 buildbot/master: add secrets

---
 shared/2configs/buildbot-standalone.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 51c60032..28d1eef2 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -8,6 +8,9 @@ in {
   };
   networking.firewall.allowedTCPPorts = [ 8010 9989 ];
   krebs.buildbot.master = {
+    secrets = [
+      "cac.json"
+    ];
     slaves = {
       testslave =  "krebspass";
       omo = "krebspass";
@@ -93,9 +96,8 @@ in {
   # slave needs 2 files:
   # * cac.json
   # * retiolum
-  for file in ["cac.json", "retiolum.rsa_key.priv"]:
-    s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/{}".format(file),
-                            slavedest=file))
+  s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json"))
+  s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv"))
 
   addShell(s, name="infest-cac-centos7",env=env,
               sigtermTime=60,           # SIGTERM 1 minute before SIGKILL
-- 
cgit v1.2.3


From a8cb9d41bdefe8a5dc72ca76b3ebc5b4047ddf65 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 30 Dec 2015 02:45:47 +0100
Subject: s 1 test-all-krebs-modules: init

---
 shared/1systems/test-all-krebs-modules.nix | 45 ++++++++++++++++++++++++++++++
 shared/2configs/buildbot-standalone.nix    | 17 ++++++++---
 2 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 shared/1systems/test-all-krebs-modules.nix

(limited to 'shared')

diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix
new file mode 100644
index 00000000..b98004df
--- /dev/null
+++ b/shared/1systems/test-all-krebs-modules.nix
@@ -0,0 +1,45 @@
+{ config, pkgs, lib, ... }:
+let
+  en = { enable = true;};
+in {
+  krebs = {
+    enable = true;
+    build.user = config.krebs.users.shared;
+    build.host = config.krebs.hosts.test-all-krebs-modules;
+    Reaktor.enable = true;
+    apt-cacher-ng.enable = true;
+    backup.enable = true;
+    bepasty.enable = true;
+    buildbot.master.enable = true;
+    buildbot.slave = {
+      enable = true;
+      username = "lol";
+      password = "wut";
+    };
+    exim-retiolum.enable = true;
+    exim-smarthost = {
+      enable = true;
+      system-aliases = [ { from = "dick"; to = "butt"; } ];
+    };
+    go.enable = true;
+    iptables = {
+      enable = true;
+      tables = {};
+    };
+    nginx.enable = true;
+    realwallpaper.enable = true;
+    retiolum.enable = true;
+    retiolum-bootstrap.enable = true;
+    tinc_graphs.enable = true;
+    urlwatch.enable = true;
+    fetchWallpaper = {
+      enable = true;
+      url ="localhost";
+    };
+  };
+  # just get the system running
+  boot.loader.grub.devices = ["/dev/sda"];
+  fileSystems."/" = {
+    device = "/dev/lol";
+  };
+}
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 28d1eef2..22e9861c 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -8,12 +8,9 @@ in {
   };
   networking.firewall.allowedTCPPorts = [ 8010 9989 ];
   krebs.buildbot.master = {
-    secrets = [
-      "cac.json"
-    ];
+    secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
     slaves = {
       testslave =  "krebspass";
-      omo = "krebspass";
     };
     change_source.stockholm = ''
   stockholm_repo = 'http://cgit.gum/stockholm'
@@ -85,6 +82,18 @@ in {
   addShell(f,name="eval-cross-check",env=env,
             command=nixshell + ["! make eval get=krebs.deploy filter=json system=test-failing"])
 
+  addShell(f,name="instaniate-test-all-modules",env=env,
+            command=nixshell + \
+                      ["touch retiolum.rsa_key.priv; \
+                        nix-instantiate --eval -A \
+                            users.shared.test-all-krebs-modules.system \
+                            -I stockholm=. \
+                            -I secrets=. '<stockholm>' \
+                            --argstr current-date lol \
+                            --argstr current-user-name shared \
+                            --argstr current-host-name lol \
+                            --strict --json"])
+
   bu.append(util.BuilderConfig(name="fast-tests",
         slavenames=slavenames,
         factory=f))
-- 
cgit v1.2.3


From 2bee6a0f6d71fbb1e1f02bd0df396bc38d3b6f67 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 30 Dec 2015 04:43:16 +0100
Subject: s 2 buildbot-standalone: cosmetics

---
 shared/2configs/buildbot-standalone.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 22e9861c..c62f8920 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -73,16 +73,16 @@ in {
       fast-tests = ''
   f = util.BuildFactory()
   f.addStep(grab_repo)
-  addShell(f,name="centos7-eval",env=env,
+  addShell(f,name="deploy-eval-centos7",env=env,
             command=nixshell + ["make -s eval get=krebs.deploy filter=json system=test-centos7"])
 
-  addShell(f,name="wolf-eval",env=env,
+  addShell(f,name="deploy-eval-wolf",env=env,
             command=nixshell + ["make -s eval get=krebs.deploy filter=json system=wolf"])
 
-  addShell(f,name="eval-cross-check",env=env,
+  addShell(f,name="deploy-eval-cross-check",env=env,
             command=nixshell + ["! make eval get=krebs.deploy filter=json system=test-failing"])
 
-  addShell(f,name="instaniate-test-all-modules",env=env,
+  addShell(f,name="instantiate-test-all-modules",env=env,
             command=nixshell + \
                       ["touch retiolum.rsa_key.priv; \
                         nix-instantiate --eval -A \
@@ -110,7 +110,7 @@ in {
 
   addShell(s, name="infest-cac-centos7",env=env,
               sigtermTime=60,           # SIGTERM 1 minute before SIGKILL
-              timeout=5400,             # 1.5h timeout
+              timeout=7200,             # 2h
               command=nixshell + ["infest-cac-centos7"])
 
   bu.append(util.BuilderConfig(name="full-tests",
@@ -137,6 +137,7 @@ in {
     username = "testslave";
     password = "krebspass";
     packages = with pkgs;[ git nix ];
+    # all nix commands will need a working nixpkgs installation
     extraEnviron = { NIX_PATH="nixpkgs=${toString <nixpkgs>}"; };
   };
 }
-- 
cgit v1.2.3


From ca9e1700ef0deac0b71d4c3e2a6d1ee0a0ccbc42 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 30 Dec 2015 14:47:40 +0100
Subject: s 1 minimal-deploy: init test

---
 shared/1systems/test-minimal-deploy.nix | 13 +++++++++++++
 shared/2configs/buildbot-standalone.nix | 11 +++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 shared/1systems/test-minimal-deploy.nix

(limited to 'shared')

diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix
new file mode 100644
index 00000000..ddd96f6b
--- /dev/null
+++ b/shared/1systems/test-minimal-deploy.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, lib, ... }:
+{
+  krebs = {
+    enable = true;
+    build.user = config.krebs.users.shared;
+    build.host = config.krebs.hosts.test-all-krebs-modules;
+  };
+  # just get the system running
+  boot.loader.grub.devices = ["/dev/sda"];
+  fileSystems."/" = {
+    device = "/dev/lol";
+  };
+}
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index c62f8920..6ffd7fe8 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -94,6 +94,17 @@ in {
                             --argstr current-host-name lol \
                             --strict --json"])
 
+  addShell(f,name="instantiate-test-minimal-deploy",env=env,
+            command=nixshell + \
+                      ["nix-instantiate --eval -A \
+                            users.shared.test-minimal-deploy.system \
+                            -I stockholm=. \
+                            -I secrets=. '<stockholm>' \
+                            --argstr current-date lol \
+                            --argstr current-user-name shared \
+                            --argstr current-host-name lol \
+                            --strict --json"])
+
   bu.append(util.BuilderConfig(name="fast-tests",
         slavenames=slavenames,
         factory=f))
-- 
cgit v1.2.3


From 5d15b95ac200359392d9a86a68905c2162404904 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 30 Dec 2015 23:37:02 +0100
Subject: s 2 buildbot: add short tree timeout before trying a test

---
 shared/2configs/buildbot-standalone.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shared')

diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 6ffd7fe8..544b54dd 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -30,6 +30,7 @@ in {
   # test the master real quick
   sched.append(schedulers.SingleBranchScheduler(
                               change_filter=util.ChangeFilter(branch="master"),
+                              treeStableTimer=10, #only test the latest push
                               name="fast-master-test",
                               builderNames=["fast-tests"]))
         '';
-- 
cgit v1.2.3


From ff945f40b1c3fdb69a5016911ab48462e00cf536 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 7 Jan 2016 08:05:05 +0100
Subject: s 2 buildbot: up cac timeout to 3h

---
 shared/2configs/buildbot-standalone.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared')

diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 544b54dd..3275189a 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -122,7 +122,7 @@ in {
 
   addShell(s, name="infest-cac-centos7",env=env,
               sigtermTime=60,           # SIGTERM 1 minute before SIGKILL
-              timeout=7200,             # 2h
+              timeout=10800,             # 3h
               command=nixshell + ["infest-cac-centos7"])
 
   bu.append(util.BuilderConfig(name="full-tests",
-- 
cgit v1.2.3