01/01: hydra: machines-for-berlin: Record RAM, disable broken nodes.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit fafbac75c3c285c792d2bd0b45261b5b18c8298d
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Jul 18 18:05:25 2019 +0200

    hydra: machines-for-berlin: Record RAM, disable broken nodes.
    
    * hydra/machines-for-berlin.scm (hosts): Record RAM in GB; disable
    141.80.167.132, 141.80.167.153, and 141.80.167.156.
    (template-x86_64): Match on RAM.
---
 hydra/machines-for-berlin.scm | 88 +++++++++++++++++++++++++++++--------------
 1 file changed, 60 insertions(+), 28 deletions(-)

diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index 7fbf60e..61e8480 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -4,85 +4,108 @@
 ;; These are all hosted at the MDC in rack A4.  They are connected to
 ;; a dedicated VLAN and can only be accessed from berlin.guixsd.org.
 (define hosts
-  '(;; hydra-guix-01; big node, not on GuixSD yet!
+  '(;; hydra-guix-01; big node, not on Guix System yet, so it's disabled as it 
has no GC cron job.
     ;; nodes 02 and 03 have been replaced by this node.
-    ("141.80.167.132"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMWlWUugocIkWzyxWxsJxrnIaDSUeICssBq9aqSNZivJ")
+    ;; ("141.80.167.132"
+    ;;  "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMWlWUugocIkWzyxWxsJxrnIaDSUeICssBq9aqSNZivJ"
+    ;;  132)
     ;; hydra-guix-04
     ("141.80.167.135"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIJBS5YOhjngLWE4LEQmsVQ0Oxidy3QfQlyxp+aK0cnf")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIJBS5YOhjngLWE4LEQmsVQ0Oxidy3QfQlyxp+aK0cnf"
+     16)
     ;; hydra-guix-05
     ("141.80.167.136"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFNhrcrMnwVyOEJpXwEQkvAp6HfE79s2cNJf8DHC8GTv")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFNhrcrMnwVyOEJpXwEQkvAp6HfE79s2cNJf8DHC8GTv"
+     64)
     ;; hydra-guix-06
     ("141.80.167.137"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGEvwgtlWCvtZb38cDgICAdIF8KojWCrMBKT2i3fKB+l")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGEvwgtlWCvtZb38cDgICAdIF8KojWCrMBKT2i3fKB+l"
+     16)
     ;; hydra-guix-07, broken disk, fails to boot.  I turned it off.
     ;; I already changed the server to be sure it's not the controller.
     ;; ("141.80.167.138"
     ;;  "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIF6P0X1V8rBjY2MzrF+D12ewk2xDtqqdrAG0br0cQEU9")
     ;; hydra-guix-08
     ("141.80.167.139"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIAcwpKSO33tqW5tnGyk8t0ZBiXqXQnbLqe++XYzpi+vC")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIAcwpKSO33tqW5tnGyk8t0ZBiXqXQnbLqe++XYzpi+vC"
+     16)
     ;; hydra-guix-09
     ("141.80.167.140"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIDiPbdAAWc7YRiDORu4uSjjUXWmGbGwwhVMuclyfeRku")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIDiPbdAAWc7YRiDORu4uSjjUXWmGbGwwhVMuclyfeRku"
+     64)
     ;; hydra-guix-10
     ("141.80.167.141"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIyuS1MndiMbm3prey/2ccBidoz23nM6DAsurl9Yb7g6")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIyuS1MndiMbm3prey/2ccBidoz23nM6DAsurl9Yb7g6"
+     16)
     ;; hydra-guix-11
     ("141.80.167.142"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIEV/kwYw7DSs0SW+2ckl0nGjdOejcYNqx4nylz73DINp")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIEV/kwYw7DSs0SW+2ckl0nGjdOejcYNqx4nylz73DINp"
+     64)
     ;; hydra-guix-12
     ("141.80.167.143"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFpNX9c3Gg2W0OHPC5HVPNQmYneve9dzJ2sNOLFVaE8A")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFpNX9c3Gg2W0OHPC5HVPNQmYneve9dzJ2sNOLFVaE8A"
+     64)
     ;; hydra-guix-13
     ("141.80.167.144"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAICKjJaVpqc8gQ9mQaxR/q1mp8ph1Dhc3ppc9c0ndCxll")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAICKjJaVpqc8gQ9mQaxR/q1mp8ph1Dhc3ppc9c0ndCxll"
+     64)
     ;; hydra-guix-14
     ("141.80.167.145"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIKN4ElXT6fA85AcrBfvAgDoJ6ySOP2IHSY7aXgZ+QzOH")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIKN4ElXT6fA85AcrBfvAgDoJ6ySOP2IHSY7aXgZ+QzOH"
+     64)
     ;; hydra-guix-15
     ("141.80.167.146"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJZNXe33AmYuLYRj3l36ISOBARRwWPGmK8Z23Pthy5A+")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJZNXe33AmYuLYRj3l36ISOBARRwWPGmK8Z23Pthy5A+"
+     64)
     ;; hydra-guix-16
     ("141.80.167.147"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFJCI6Q6Jj0Jgzg3EynK2udulD4ut7jOZd8io+PuNJed")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFJCI6Q6Jj0Jgzg3EynK2udulD4ut7jOZd8io+PuNJed"
+     64)
     ;; hydra-guix-17, broken disk
     ;; ("141.80.167.148"
     ;;  "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIOTaTAJNxFbPQTXjGiQ0+taDGJCirxOTe3vK++jxHTtR")
     ;; hydra-guix-18
     ("141.80.167.149"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAICdg/NuiqdpbMW1y00AhyqhBr4J6SeVvDKXQ01m97kZj")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAICdg/NuiqdpbMW1y00AhyqhBr4J6SeVvDKXQ01m97kZj"
+     16)
     ;; hydra-guix-19
     ("141.80.167.150"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIBIWiJFShafxIcJV12OzzCUczrSD65ftTfFiLRkK188D")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIBIWiJFShafxIcJV12OzzCUczrSD65ftTfFiLRkK188D"
+     64)
     ;; hydra-guix-20
     ("141.80.167.151"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJBTH6H0vtjuNd6Zil9w9iPUbuCUDDd3ZPUQGy75oqE5")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJBTH6H0vtjuNd6Zil9w9iPUbuCUDDd3ZPUQGy75oqE5"
+     16)
     ;; hydra-guix-21
     ("141.80.167.152"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMR7jHaV2iKH+nbzbmzXawvOCZEYbkQmU840GIDBrIQp")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMR7jHaV2iKH+nbzbmzXawvOCZEYbkQmU840GIDBrIQp"
+     64)
+    ;; This one is unexpectedly no longer available -- Ricardo, 2019-06-28
     ;; hydra-guix-22
-    ("141.80.167.153"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIPNM1227zb06b+f7CaoswoqKVmsqhQbVqSxAmbV76kr6")
+    ;; ("141.80.167.153"
+    ;;  "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIPNM1227zb06b+f7CaoswoqKVmsqhQbVqSxAmbV76kr6")
     ;; hydra-guix-23
     ("141.80.167.154"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJqq+CxIa2bVf7a9hGfyt3kQcEaZhumBa5nPnBq5vnnR")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJqq+CxIa2bVf7a9hGfyt3kQcEaZhumBa5nPnBq5vnnR"
+     64)
     ;; hydra-guix-24
     ("141.80.167.155"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMV8v+fL04JUNJK5JLiXFwyFDiXyRkcBqJYCUgTAP0it")
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMV8v+fL04JUNJK5JLiXFwyFDiXyRkcBqJYCUgTAP0it"
+     64)
+    ;; Store corrupted (empty .drv files).   -- Ludo', 2019-04-08
     ;; hydra-guix-25
-    ("141.80.167.156"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIA+ZoD9lcmt0zBZcc8keBb8wSXgfoK5zk4s6Oteg27wb")
+    ;; ("141.80.167.156"
+    ;;  "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIA+ZoD9lcmt0zBZcc8keBb8wSXgfoK5zk4s6Oteg27wb"
+    ;;  64)
     ;; hydra-guix-26
     ("141.80.167.157"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGquqUVY3cNMomwd4lfgXPRvxJZvvYa7ud67g01b/YTT")))
+     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGquqUVY3cNMomwd4lfgXPRvxJZvvYa7ud67g01b/YTT"
+     64)))
 
 (define template-x86_64
   (match-lambda
     ;; Prefer building on the big node.
-    (("141.80.167.132" key)
+    (("141.80.167.132" key _)
      (build-machine
       (name "141.80.167.132")
       (user "hydra")
@@ -92,7 +115,16 @@
       (speed 2.2)                                 ;don't increase it too much
                                                   ;or everything goes there
       (parallel-builds 16)))
-    ((ip key)
+    ((ip key 16)
+     (build-machine
+      (name ip)
+      (user "hydra")
+      (system "x86_64-linux")
+      (host-key key)
+      (compression "no")
+      (speed 2)
+      (parallel-builds 2)))
+    ((ip key ram)
      (build-machine
       (name ip)
       (user "hydra")