02/02: hydra: Move i586-gnu builds to build machines.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit ae20c49e0b26acd3c6c64b6c551fcadc8e229d2f
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Oct 2 10:56:14 2023 +0200

    hydra: Move i586-gnu builds to build machines.
    
    This is made possible thanks to zero-configuration childhurd offloading,
    added in Guix commit 953c65ffdd43c02c934518fb7a1c68542584b223.
    
    * hydra/modules/sysadmin/services.scm (frontend-services): Remove
    ‘cuirass-remote-worker-service-type’.
    * hydra/berlin-nodes.scm: Add i586-gnu to the systems supported by
    ‘childhurd-ip?’ machines.
---
 hydra/berlin-nodes.scm              |  9 ++++++++-
 hydra/modules/sysadmin/services.scm | 13 -------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/hydra/berlin-nodes.scm b/hydra/berlin-nodes.scm
index 47f413e..37f6e22 100644
--- a/hydra/berlin-nodes.scm
+++ b/hydra/berlin-nodes.scm
@@ -143,7 +143,14 @@
                                         '("ppc64le")
                                         #:childhurd? (childhurd-ip? ip)
                                         #:systems
-                                        `("x86_64-linux" "i686-linux")
+                                        (let ((lst '("x86_64-linux"
+                                                     "i686-linux")))
+                                          ;; Machines with a childhurd
+                                          ;; offload *-gnu builds to their
+                                          ;; local childhurd, transparently.
+                                          (if (childhurd-ip? ip)
+                                              (cons "i586-gnu" lst)
+                                              lst))
                                         #:max-jobs 4
                                         ;; The big-memory machines have 96
                                         ;; logical cores, the others 64.
diff --git a/hydra/modules/sysadmin/services.scm 
b/hydra/modules/sysadmin/services.scm
index 8bc2e6d..95b4987 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -734,19 +734,6 @@ to a selected directory.")
                           #:systems systems
                           #:nar-ttl nar-ttl)
 
-         ;; This remote worker takes care of GNU/Hurd builds by offloading to
-         ;; childhurds actually hosted on build machines but listed in
-         ;; berlin's /etc/guix/machines.scm.
-         ;;
-         ;; TODO: Set up remote-worker on build machines themselves once SSH
-         ;; and nar keys are properly authorized; longer-term: set up
-         ;; remote-worker directly within the childhurd.
-         (service cuirass-remote-worker-service-type
-                  (cuirass-remote-worker-configuration
-                   (workers 4)
-                   (systems '("i586-gnu"))
-                   (substitute-urls '("http://141.80.167.131";))))
-
          (service openssh-service-type
                   (openssh-configuration
                    (password-authentication? #f)))