From 427488be8176024e758fe40be32593a10fb1a53b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 29 Aug 2018 17:42:00 +0200
Subject: repo-sync: add konsens for krops & stockholm

---
 krebs/2configs/repo-sync.nix | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index 7c3b2c90e..813dc154b 100644
--- a/krebs/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
@@ -3,6 +3,10 @@
 with import <stockholm/lib>;
 
 let
+  konsens-user = {
+    name = "konsens";
+    pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIKKozGNGBAzHnyj6xUlsjGxxknyChXvuyrddkWVVnz7";
+  };
   mirror = "git@${config.networking.hostName}:";
 
   defineRepo = {
@@ -20,7 +24,7 @@ let
           verbose = false;
           channel = "#xxx";
           server = "irc.r";
-          branches = [ "newest" ];
+          branches = [ "master" "newest" ];
         };
       };
     };
@@ -37,6 +41,13 @@ let
         repo = [ repo ];
         perm = push ''refs/*'' [ non-fast-forward create delete merge ];
       }
+      {
+        user = [
+          konsens-user
+        ];
+        repo = [ repo ];
+        perm = push ''refs/heads/master'' [ create merge ];
+      }
       {
         user = attrValues config.krebs.users;
         repo = [ repo ];
@@ -108,6 +119,19 @@ in {
   krebs.repo-sync = {
     enable = true;
   };
+  krebs.konsens = {
+    enable = true;
+    repos = {
+      krops = { branchesToCheck = [ "lassulus" "tv" ]; };
+      stockholm = {};
+    };
+  };
+  krebs.secret.files.konsens = {
+    path = "/var/lib/konsens/.ssh/id_ed25519";
+    owner = konsens-user;
+    source-path = "${<secrets/konsens.id_ed25519>}";
+  };
+
   imports = [
     (sync-retiolum { name = "the_playlist"; desc = "Good Music collection + tools"; section = "art"; })
 
-- 
cgit v1.2.3


From 7af81afa3d603a874fd4d0bff1885fe2f91afd41 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Wed, 29 Aug 2018 17:53:56 +0200
Subject: buildbot-standalone: check cgit.hotdog.r

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

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 62a5f9ab5..1ed38f54f 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -24,7 +24,7 @@ in
       testslave = "lasspass";
     };
     change_source.stockholm = ''
-      stockholm_repo = 'http://cgit.prism.r/stockholm'
+      stockholm_repo = 'http://cgit.hotdog.r/stockholm'
       cs.append(
           changes.GitPoller(
               stockholm_repo,
-- 
cgit v1.2.3


From f8a594cff85af8e19fa3aa7e6159004105285142 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 7 Sep 2018 17:30:31 +0200
Subject: buildbot-stockholm: use krops.nix

---
 krebs/2configs/buildbot-stockholm.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 1ed38f54f..13d4c6729 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -4,6 +4,14 @@ let
 
   hostname = config.networking.hostName;
 
+  build = pkgs.writeDash "build" ''
+    set -eu
+    export USER="$1"
+    export SYSTEM="$2"
+    $(nix-build $USER/krops.nix --no-out-link --argstr name "$SYSTEM" --argstr target "$HOME/stockholm-build" -A ci)
+  '';
+
+
 in
 {
   networking.firewall.allowedTCPPorts = [ 80 ];
@@ -95,15 +103,9 @@ in
                         env={
                           "NIX_PATH": "secrets=/var/src/stockholm/null:stockholm=./:/var/src",
                           "NIX_REMOTE": "daemon",
-                          "dummy_secrets": "true",
                         },
                         command=[
-                          "nix-shell", "-I", "stockholm=.", "--run", " ".join(["test",
-                            "--user={}".format(user),
-                            "--system={}".format(host),
-                            "--force-populate",
-                            "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user),
-                          ])
+                          "${build}", user, host
                         ],
                         timeout=90001,
                         workdir='build', # TODO figure out why we need this?
-- 
cgit v1.2.3