branch master updated: hydra: Adjust offload setup for childhurds.

[Ludovic Courtès]

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

civodul pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new d5913d4  hydra: Adjust offload setup for childhurds.
d5913d4 is described below

commit d5913d4ecf9bb5ff7aa84bc6c03d6750ee051465
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Dec 2 17:35:40 2023 +0100

    hydra: Adjust offload setup for childhurds.
    
    This is a followup to 65f217f6bdbb6c3251fd5d9cd8e2ec83a488af12.
    
    * hydra/machines-for-berlin.scm (template-x86_64): Move ‘childhurd-ip?’
    condition to the first clause.
---
 hydra/machines-for-berlin.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index 38de30d..6961e60 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -133,11 +133,17 @@
 (define template-x86_64
   (match-lambda
     ;; Prefer building on the new nodes.
-    ((name key 128)
+    ((ip key 128)
      (build-machine
-      (name name)
+      (name ip)
       (user "hydra")
-      (systems '("x86_64-linux" "i686-linux"))
+      (systems
+       ;; Some of these machines run a childhurd, which they offload to (we
+       ;; effectively have two-level offloading, then).
+       (append (if (childhurd-ip? ip)
+                   '("i586-gnu")
+                   '())
+               '("x86_64-linux" "i686-linux")))
       (host-key key)
       (compression "no")
       (speed 3)                                   ;don't increase it too much
@@ -157,13 +163,7 @@
      (build-machine
       (name ip)
       (user "hydra")
-      (systems
-       ;; Some of these machines run a childhurd, which they offload to (we
-       ;; effectively have two-level offloading, then).
-       (append (if (childhurd-ip? ip)
-                   '("i586-gnu")
-                   '())
-               '("x86_64-linux" "i686-linux")))
+      (systems '("x86_64-linux" "i686-linux"))
       (host-key key)
       (compression "no")
       (speed 2)