branch master updated: Fix machines-for-berlin.scm.

[Mathieu Othacehe]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 76e9199  Fix machines-for-berlin.scm.
76e9199 is described below

commit 76e91992866244a188c472dd9373a1d55d5b079b
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Thu Oct 15 11:04:35 2020 +0200

    Fix machines-for-berlin.scm.
    
    * hydra/machines-for-berlin: Fix indentation and syntax.
---
 hydra/machines-for-berlin.scm | 110 ++++++++++++++++++++++--------------------
 1 file changed, 58 insertions(+), 52 deletions(-)

diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index a1597c2..ff5ffeb 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -1,11 +1,12 @@
 ;; Install this file as /etc/guix/machines.scm on berlin.guix.gnu.org
-(use-modules (ice-9 match) (srfi srfi-1))
+(add-to-load-path "/root/maintenance/hydra/modules")
+(use-modules (ice-9 match) (srfi srfi-1) (sysadmin build-machines))
 
 ;; These are all hosted at the MDC in Berlin Buch.  They are connected to
 ;; a dedicated VLAN and can only be accessed from berlin.guix.gnu.org.
 (define hosts
   '(;;; New machines.  We should use DNS for them in the future.
-       ;; hydra-guix-101
+    ;; hydra-guix-101
     ("141.80.167.158"
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGqLy+LVndyfuzwZmln/nrHylAN7FotSmso9kZaYPpzo"
      128)
@@ -57,7 +58,7 @@
     ("141.80.167.170"
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMn5ujp4uTRVwYGPr2kgh7YMXISj+WyRxe8cGxzb1KrL"
      128)
-       ;; hydra-guix-114
+    ;; hydra-guix-114
     ("141.80.167.171"
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIF4ST+J7Xdmrft+sD1HEOAjADA+QZ+hMXRV3PnN0Rs+A"
      128)
@@ -86,7 +87,6 @@
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIH3rXQZCQbVliJUgavSxNWvA4XUX7cXj7zd5VvUggCbv"
      128)
     ;; hydra-guix-121
-    #;
     ("141.80.167.178"
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGNVaPCyKRrprBivEWYmtVecaJ+DIkET3gCYzGOuRAcz"
      128)
@@ -103,11 +103,11 @@
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIODiKP7qIkkDeqvzKG2JsrDlNRe3CTN+icGgQ1J5ZUP+"
      128)
     ;; hydra-guix-125
-       ;; This is the new head node
-       #;
+    ;; This is the new head node
+    #;
     ("141.80.167.182"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIPrlasUtgZgKfJ0oNhBQx/2QIQ+J+jbAT842VoJlBhor"
-     192)
+    "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIPrlasUtgZgKfJ0oNhBQx/2QIQ+J+jbAT842VoJlBhor"
+    192)
     ;; hydra-guix-126
     ("141.80.167.183"
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIUprP1E2cRkMrwBnl1FkeCQ5UhZRin6dKQrB9p4WrV6"
@@ -119,8 +119,8 @@
     ;; hydra-guix-128
     #;
     ("141.80.167.185"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIAIomlYpFmdaTiWGf4DWs6sc831zbNlU5XBjicHmZINA"
-     192)
+    "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIAIomlYpFmdaTiWGf4DWs6sc831zbNlU5XBjicHmZINA"
+    192)
     ;; hydra-guix-129
     ("141.80.167.186"
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAICBZkQ4ZQgMGs/3druNQLsyFWHVhjtmN/sj1fxrPeUqJ"
@@ -137,7 +137,7 @@
       (host-key key)
       (compression "no")
       (speed 3)                                   ;don't increase it too much
-                                                  ;or everything goes there
+                                        ;or everything goes there
       (parallel-builds 16)))
     ((name key 192)
      (build-machine
@@ -147,7 +147,7 @@
       (host-key key)
       (compression "no")
       (speed 3)                                   ;don't increase it too much
-                                                  ;or everything goes there
+                                        ;or everything goes there
       (parallel-builds 16)))
     ((ip key ram)
      (build-machine
@@ -215,17 +215,19 @@
         ;; Disabled 2019-12-08 as it moves elsewhere  -- Ludo'
         #;
         (build-machine
-         ;;(name "monokuma.lepiller.eu")
-         ;;(port 2222)
-            (name "localhost")
-            (port 2230)
-            (user "hydra")
-            (systems '("aarch64-linux"))
-            (host-key
-             "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIXfDYhBeVH0GenVp8PplaRF1jtNSOdLeNWf2k8G7K71 root@gnu")
-         (parallel-builds 2))
+        ;;(name "monokuma.lepiller.eu")
+        ;;(port 2222)
+        (name "localhost")
+        (port 2230)
+        (user "hydra")
+        (systems '("aarch64-linux"))
+        (host-key
+        "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIXfDYhBeVH0GenVp8PplaRF1jtNSOdLeNWf2k8G7K71 root@gnu")
+        (parallel-builds 2))
 
-        ;; Note: Temporary SSH tunnel set up for {dmitri,sergei}.
+        ;; Note: Temporary SSH tunnel set up for {dmitri,sergei}.  If you see
+        ;; offload errors, check whether there are multiple instances running.
+        ;; *Please ping* nckx in case of trouble!
         (build-machine
          ;; Dynamic IP.
          ;; (name "dmitri.tobias.gr")
@@ -264,49 +266,53 @@
     (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJEbCOTTg9Tl0E23Mnc0UA4Ib2W5oDqTukk6mT98tOph 
root@beaglebone"))
 
    #;(build-machine
-    (name "hydra-slave1.netris.org")
-    (port 7275)
-    (user "hydra")
-    (systems '("armhf-linux"))
-    (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIPDAe9mXufZXFfFlezafA/G2Nng66ssLLi5xPP+9NhGm 
root@hydra-slave1")
-    (speed 1.0)
-    (parallel-builds 2))
+   (name "hydra-slave1.netris.org")
+   (port 7275)
+   (user "hydra")
+   (systems '("armhf-linux"))
+   (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIPDAe9mXufZXFfFlezafA/G2Nng66ssLLi5xPP+9NhGm 
root@hydra-slave1")
+   (speed 1.0)
+   (parallel-builds 2))
 
    ;; I/O errors as of 2020-02-27
    #;(build-machine
-    (name "hydra-slave2.netris.org")
-    (port 7276)
-    (user "hydra")
-    (systems '("armhf-linux"))
-    (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIHzlJZzZfPiEcehmLFtQVYVt3j9w4DHPL6YgSC3EHJK+ 
root@hydra-slave2")
-    (speed 1.0)
-    (parallel-builds 2))
+   (name "hydra-slave2.netris.org")
+   (port 7276)
+   (user "hydra")
+   (systems '("armhf-linux"))
+   (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIHzlJZzZfPiEcehmLFtQVYVt3j9w4DHPL6YgSC3EHJK+ 
root@hydra-slave2")
+   (speed 1.0)
+   (parallel-builds 2))
 
    ;; Not responding as of 2020-02-27
    #;(build-machine
-    (name "hydra-slave3.netris.org")
-    (port 7274)
-    (user "hydra")
-    (systems '("armhf-linux"))
-    (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIBLOVhnS24E+Z1bXLUU4z4gE5+HsFxDxUPA6MbLHmnME 
root@hydra-slave3")
-    (speed 1.0)
-    (parallel-builds 2))))
+   (name "hydra-slave3.netris.org")
+   (port 7274)
+   (user "hydra")
+   (systems '("armhf-linux"))
+   (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIBLOVhnS24E+Z1bXLUU4z4gE5+HsFxDxUPA6MbLHmnME 
root@hydra-slave3")
+   (speed 1.0)
+   (parallel-builds 2))))
+
+(define build-machine-name
+  (@@ (guix scripts offload) build-machine-name))
 
 (let* ((x86_64 (map template-x86_64 hosts))
-       (fast   (filter-map (match-lambda
-                           ((name key 128)
-                            (find (lambda (machine)
-                                    (string=? ((@@ (guix scripts offload) 
build-machine-name) machine) name))
-                                  x86_64))
-                           (_ #f))
-                          hosts))
+       (fast   (filter-map
+                (match-lambda
+                  ((name key 128)
+                   (find (lambda (machine)
+                           (string=? (build-machine-name machine) name))
+                                    x86_64))
+                             (_ #f))
+                           hosts))
        (fast/hurd (filter (compose childhurd-ip? build-machine-name) fast)))
   (append overdrive
           ;; This has been disabled until bug# 43513 is fixed.
-          ;(map aarch64->armhf overdrive)
+          ;;(map aarch64->armhf overdrive)
           armv7
           x86_64
           (map x86_64->qemu-aarch64 fast)
           ;; This has been disabled until bug# 43513 is fixed.
-          ;(map x86_64->qemu-armhf fast)
+          ;;(map x86_64->qemu-armhf fast)
           (map x86_64->childhurd fast/hurd)))