branch master updated: hydra: Remove obsolete nodes.

[Ricardo Wurmus]

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

rekado pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 20f2a09  hydra: Remove obsolete nodes.
20f2a09 is described below

commit 20f2a09c74616007c7ff486ec702b197411e41f2
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Thu Feb 27 12:45:57 2020 +0100

    hydra: Remove obsolete nodes.
    
    * hydra/machines-for-berlin.scm (hosts): Remove records for
    hydra-guix-04..26.
    (template-x86_64): Remove case for 16 GB RAM nodes.
    * hydra/berlin-nodes.scm: Do not build machines from old ids.
    (%ids, system-for, id->ip): Remove.
---
 hydra/berlin-nodes.scm        | 42 ++++-----------------
 hydra/machines-for-berlin.scm | 86 +------------------------------------------
 2 files changed, 10 insertions(+), 118 deletions(-)

diff --git a/hydra/berlin-nodes.scm b/hydra/berlin-nodes.scm
index 2fe2932..bc8d90b 100644
--- a/hydra/berlin-nodes.scm
+++ b/hydra/berlin-nodes.scm
@@ -5,23 +5,6 @@
              (sysadmin people)
              (srfi srfi-1))
 
-(define %ids '(4
-               ;; 5 -> dead
-               6 8 9 10 11 12 13 14 15 16
-               ;;17 -> no route
-               18 19 20 21 22 23 24 25 26))
-
-(define (system-for id)
-  (berlin-build-machine-os id
-                           #:emulated-architectures
-                           (if (memv id (take %ids 10))
-                               `("arm" "aarch64")
-                               '())))
-
-(define (id->ip id)
-  (format #f "141.80.167.~d" (+ 131 id)))
-
-
 (define %new-ids
  (delete 114 (iota 26 104 1)))
 (define (new-system-for id)
@@ -29,20 +12,11 @@
                                #:emulated-architectures
                                '("arm" "aarch64")))
 
-(append
- (map (lambda (id)
-        (machine
-         (operating-system (system-for id))
-         (environment managed-host-environment-type)
-         (configuration (machine-ssh-configuration
-                         (system "x86_64-linux")
-                         (host-name (id->ip id))))))
-      %ids)
- (map (lambda (id)
-        (machine
-         (operating-system (new-system-for id))
-         (environment managed-host-environment-type)
-         (configuration (machine-ssh-configuration
-                         (system "x86_64-linux")
-                         (host-name (format #f "141.80.167.~d" (+ id 57)))))))
-      %new-ids))
+(map (lambda (id)
+       (machine
+        (operating-system (new-system-for id))
+        (environment managed-host-environment-type)
+        (configuration (machine-ssh-configuration
+                        (system "x86_64-linux")
+                        (host-name (format #f "141.80.167.~d" (+ id 57)))))))
+     %new-ids)
diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index 75ef03a..c344969 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -1,83 +1,10 @@
 ;; Install this file as /etc/guix/machines.scm on berlin.guix.gnu.org
 (use-modules (ice-9 match) (srfi srfi-1))
 
-;; These are all hosted at the MDC in rack A4.  They are connected to
+;; 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
-  '(;; hydra-guix-04
-    ("141.80.167.135"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIJBS5YOhjngLWE4LEQmsVQ0Oxidy3QfQlyxp+aK0cnf"
-     16)
-    ;; hydra-guix-06
-    ("141.80.167.137"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGEvwgtlWCvtZb38cDgICAdIF8KojWCrMBKT2i3fKB+l"
-     16)
-    ;; hydra-guix-08
-    ("141.80.167.139"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIAcwpKSO33tqW5tnGyk8t0ZBiXqXQnbLqe++XYzpi+vC"
-     16)
-    ;; hydra-guix-09
-    ("141.80.167.140"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIDiPbdAAWc7YRiDORu4uSjjUXWmGbGwwhVMuclyfeRku"
-     64)
-    ;; hydra-guix-10
-    ("141.80.167.141"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIIyuS1MndiMbm3prey/2ccBidoz23nM6DAsurl9Yb7g6"
-     16)
-    ;; hydra-guix-11
-    ("141.80.167.142"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIEV/kwYw7DSs0SW+2ckl0nGjdOejcYNqx4nylz73DINp"
-     64)
-    ;; hydra-guix-12
-    ("141.80.167.143"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFpNX9c3Gg2W0OHPC5HVPNQmYneve9dzJ2sNOLFVaE8A"
-     64)
-    ;; hydra-guix-13
-    ("141.80.167.144"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAICKjJaVpqc8gQ9mQaxR/q1mp8ph1Dhc3ppc9c0ndCxll"
-     64)
-    ;; hydra-guix-15
-    ("141.80.167.146"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJZNXe33AmYuLYRj3l36ISOBARRwWPGmK8Z23Pthy5A+"
-     64)
-    ;; hydra-guix-16
-    ("141.80.167.147"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFJCI6Q6Jj0Jgzg3EynK2udulD4ut7jOZd8io+PuNJed"
-     64)
-    ;; hydra-guix-18
-    ("141.80.167.149"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAICdg/NuiqdpbMW1y00AhyqhBr4J6SeVvDKXQ01m97kZj"
-     16)
-    ;; hydra-guix-19
-    ("141.80.167.150"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIBIWiJFShafxIcJV12OzzCUczrSD65ftTfFiLRkK188D"
-     64)
-    ;; hydra-guix-20
-    ("141.80.167.151"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJBTH6H0vtjuNd6Zil9w9iPUbuCUDDd3ZPUQGy75oqE5"
-     16)
-    ;; hydra-guix-21
-    ("141.80.167.152"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMR7jHaV2iKH+nbzbmzXawvOCZEYbkQmU840GIDBrIQp"
-     64)
-    ;; hydra-guix-22 (slow disk)
-    ("141.80.167.153"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIPNM1227zb06b+f7CaoswoqKVmsqhQbVqSxAmbV76kr6"
-     64)
-    ;; hydra-guix-23
-    ("141.80.167.154"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIJqq+CxIa2bVf7a9hGfyt3kQcEaZhumBa5nPnBq5vnnR"
-     64)
-    ;; hydra-guix-24
-    ("141.80.167.155"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIMV8v+fL04JUNJK5JLiXFwyFDiXyRkcBqJYCUgTAP0it"
-     64)
-    ;; hydra-guix-26
-    ("141.80.167.157"
-     "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGquqUVY3cNMomwd4lfgXPRvxJZvvYa7ud67g01b/YTT"
-     64)
-
-    ;;; New machines.  We should use DNS for them in the future.
+  '(;;; New machines.  We should use DNS for them in the future.
     ;; hydra-guix-104
     ("141.80.167.161"
      "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAINuVkwaeU+ddDpDQoxyFboiBnRNyhGDT8yOy8VAyJxZ6"
@@ -203,15 +130,6 @@
       (speed 3)                                   ;don't increase it too much
                                                   ;or everything goes there
       (parallel-builds 16)))
-    ((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)