02/03: hydra: berlin: Remove childhurd.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 27b41e0dc1303fa60b3a9645760356be78639948
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Oct 13 23:31:40 2020 +0200

    hydra: berlin: Remove childhurd.
    
    This essentially reverts commit
    7463429beeb2d32bb34c7d45ac75860495475bdf, which was used for testing.
    
    * hydra/berlin.scm (childhurd-gc-job, childhurd-os)
    (childhurd-net-options): Remove.
    <service>: Remove 'hurd-vm-service-type' instance.
---
 hydra/berlin.scm | 57 ++------------------------------------------------------
 1 file changed, 2 insertions(+), 55 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 00b6854..db9473b 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -6,7 +6,7 @@
              (guix git-download)
              (srfi srfi-1))
 (use-service-modules base databases dns monitoring networking admin shepherd
-                    mcron ssh virtualization)
+                    ssh)
 (use-package-modules admin certs emacs linux mail monitoring
                      ssh tls tor vim package-management
                      version-control
@@ -128,50 +128,7 @@ Happy hacking!\n"))
                 ,@(alist-delete "guile-fibers" (package-inputs mumi)))))))
 
 
-(define childhurd-gc-job
-  ;; Run 'guix gc' at 2AM every day.
-  #~(job '(next-hour '(2))
-        "guix gc -F 2G"))
-
-(define (childhurd-os id)
-  (operating-system
-   (inherit %hurd-vm-operating-system)
-   (host-name (format #f "hydra-childhurd-~3,'0d" id))
-   (hosts-file
-    (plain-file "hosts"
-               (string-append "127.0.0.1 localhost " host-name "\n"
-                              "::1       localhost " host-name "\n"
-                              "141.80.167.131 ci.guix.gnu.org\n")))
-   (users (cons* (user-account
-                  (name "hydra")
-                  (group "users")
-                  (home-directory "/home/hydra")
-                  (comment "Hydra User -- for offloading"))
-                 %base-user-accounts))
-   (services
-    (cons* (service mcron-service-type
-                   (mcron-configuration (jobs (list childhurd-gc-job))))
-           (modify-services
-               (operating-system-user-services %hurd-vm-operating-system)
-             (openssh-service-type
-              config =>
-              (openssh-configuration
-               (inherit config)
-               (authorized-keys
-                `(("hydra" ,(local-file 
"keys/ssh/berlin.guixsd.org.pub")))))))))))
-
-(define (childhurd-net-options id)
-  "Expose SSH and VNC ports on 0.0.0.0; for first Childhurd VM those
-are 10022 and 15900."
-  (define (qemu-vm-port base)
-    (number->string (+ base (* 1000 id))))
-  `("--device" "rtl8139,netdev=net0"
-    "--netdev" ,(string-append
-                "user,id=net0"
-                ",hostfwd=tcp:127.0.0.1:" (qemu-vm-port 11004) "-:1004"
-                ",hostfwd=tcp:0.0.0.0:" (qemu-vm-port 10022) "-:2222"
-                ",hostfwd=tcp:0.0.0.0:" (qemu-vm-port 15900) "-:5900")))
-
+
 (operating-system
   (host-name "berlin.guix.gnu.org")
   (timezone "Europe/Berlin")
@@ -377,16 +334,6 @@ are 10022 and 15900."
              (service disk-space-watchdog-service-type
                       (list (* 500 GiB) (* 50 GiB)))
 
-            ;; Hurd VM
-            (service hurd-vm-service-type
-                     (hurd-vm-configuration
-                      (os (childhurd-os 0))
-                      ;; 6G should be enough to build 'hello'
-                      (disk-size (* 12000 (expt 2 20))) ;12G
-                      (memory-size 1024)
-                       (options '("--cpu" "base" "--snapshot"))
-                      (net-options (childhurd-net-options 0))))
-
              (frontend-services %sysadmins
                                 #:gc-threshold (* 3 TiB)
                                 #:systems '("x86_64-linux" "i686-linux"