01/01: hydra: Add host keys for berlin build machines.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit 282355726ed7d94e2754bb0faa399cc71d51c246
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Aug 11 22:41:31 2017 +0200

    hydra: Add host keys for berlin build machines.
---
 hydra/machines-for-berlin.scm | 58 ++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index fa8d70b..15340b9 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -1,34 +1,40 @@
 ;; Install this file as /etc/guix/machines.scm on berlin.guixsd.org
+(use-modules (ice-9 match))
 
 ;; These are all hosted at the MDC in rack A2.  They are only
 ;; accessible through berlin.guixsd.org, which is used as a gateway.
 (define hosts
-  '("192.168.0.2"
-    ;;"192.168.0.3"
-    ;;"192.168.0.4"
-    ;;"192.168.0.5"
-    ;;"192.168.0.6"
-    "192.168.0.7"
-    ;;"192.168.0.8"
-    "192.168.0.9"
-    ;;"192.168.0.10"
-    ;;"192.168.0.11"
-    "192.168.0.12"))
+  '(("192.168.0.2"
+     "ssh-rsa 
AAAAB3NzaC1yc2EAAAAEJly77QAAAQEA9YhQax5gMmeDnl/i+2BUWw8zPTc1B4Ltdx6Wzvh/ZfhCvM/TDRbxKa3sq1w0PIsGqONtMJi3gZHRA1+0M55ha7HUs8TLQg8IKt2s+eiQ6mCDux/2ZwKu/C3MSSOqo1K+2sizGBS4yS8ncwr52rLfa5y2GzSUOjlk1LsrKwYInL4oaVcckboZVc8JKuYMRoYk2sAuGGELmtWA5fAXadIrSlh9LBT1Y74taQRt/UTtY0FeRj2qCqMECwH0585+5T0quO1HIqszeE4Epuuf9xaHenkH6ycT93HlulU8sDhU/mau4nCFHVHr311a3fLl3kBopSZZTcYLKv70cRLZ21mcWw==
 root@(none)")
+    ("192.168.0.3"
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJDK9gGqftWQM7JkUiT58AdaUhMl04874CZ3525r9MSf")
+    ;;("192.168.0.4" "TODO")
+    ;;("192.168.0.5" "TODO")
+    ;;("192.168.0.6" "TODO")
+    ("192.168.0.7"
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIF6P0X1V8rBjY2MzrF+D12ewk2xDtqqdrAG0br0cQEU9")
+    ;;("192.168.0.8" "TODO")
+    ("192.168.0.9"
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIDiPbdAAWc7YRiDORu4uSjjUXWmGbGwwhVMuclyfeRku")
+    ;;("192.168.0.10" "TODO")
+    ;;("192.168.0.11" "TODO")
+    ("192.168.0.12"
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFpNX9c3Gg2W0OHPC5HVPNQmYneve9dzJ2sNOLFVaE8A")))
 
-(define (template-x86_64 ip)
-  (build-machine
-   (name ip)
-   (user "hydra")
-   (system "x86_64-linux")
-   (host-key "ssh-rsa 
AAAAB3NzaC1yc2EAAAAEJly77QAAAQEA9YhQax5gMmeDnl/i+2BUWw8zPTc1B4Ltdx6Wzvh/ZfhCvM/TDRbxKa3sq1w0PIsGqONtMJi3gZHRA1+0M55ha7HUs8TLQg8IKt2s+eiQ6mCDux/2ZwKu/C3MSSOqo1K+2sizGBS4yS8ncwr52rLfa5y2GzSUOjlk1LsrKwYInL4oaVcckboZVc8JKuYMRoYk2sAuGGELmtWA5fAXadIrSlh9LBT1Y74taQRt/UTtY0FeRj2qCqMECwH0585+5T0quO1HIqszeE4Epuuf9xaHenkH6ycT93HlulU8sDhU/mau4nCFHVHr311a3fLl3kBopSZZTcYLKv70cRLZ21mcWw==
 root@(none)")
-   (speed 2)
-   (parallel-builds 2)))
+(define template-x86_64
+  (match-lambda
+    ((ip key)
+     (build-machine
+      (name ip)
+      (user "hydra")
+      (system "x86_64-linux")
+      (host-key key)
+      (speed 2)
+      (parallel-builds 2)))))
 
-(define (template-i686 ip)
-  (let ((m (template-x86_64 ip)))
-    (build-machine
-     (inherit m)
-     (system "i686-linux"))))
+(define (x86_64->i686 machine)
+  (build-machine (inherit machine)
+   (system "i686-linux")))
 
-(append (map template-x86_64 hosts)
-        (map template-i686 hosts))
+(let ((x86_64 (map template-x86_64 hosts)))
+  (append x86_64 (map x86_64->i686 x86_64)))