From 4031bbbb8778875dee6c159520fd3cf019abb66d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 10 Mar 2016 08:23:41 +0100
Subject: s 2 shared: build without debug

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

(limited to 'shared/2configs')

diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index b474af7b3..9804580db 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -144,7 +144,6 @@
   # * retiolum
   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
               timeout=10800,             # 3h
@@ -173,7 +172,7 @@
     masterhost = "localhost";
     username = "testslave";
     password = "krebspass";
-    packages = with pkgs;[ git nix ];
+    packages = with pkgs;[ git nix gnumake jq rsync ];
     # all nix commands will need a working nixpkgs installation
     extraEnviron = {
       NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./shared/1systems/wolf.nix"; };
-- 
cgit v1.2.3


From 1ff4b036cf26944f2452e892db89701f89c6e6b0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 11 Mar 2016 02:12:58 +0100
Subject: s 2 base: use default connectTo

---
 shared/2configs/base.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'shared/2configs')

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index f6ec93a97..7cabbd347 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -3,15 +3,7 @@
 with config.krebs.lib;
 {
   krebs.enable = true;
-  krebs.retiolum = {
-    enable = true;
-    connectTo = [
-      # TODO remove connectTo cd, this was only used for bootstrapping
-      "cd"
-      "gum"
-      "pigstarter"
-    ];
-  };
+  krebs.retiolum.enable = true;
 
   # TODO rename shared user to "krebs"
   krebs.build.user = mkDefault config.krebs.users.shared;
-- 
cgit v1.2.3