2
0
Fork 0
mirror of git://git.savannah.gnu.org/guix/maintenance.git synced 2023-12-14 03:33:04 +01:00

hydra: machines-for-berlin: Remove dependency on (sysadmin …) modules.

This was inconvenient and fragile.

* hydra/machines-for-berlin.scm <top level>: Remove 'add-to-load-path' use.
(childhurd-ip?): New procedure.
This commit is contained in:
Ludovic Courtès 2022-06-09 09:16:12 +02:00
parent db04f0a479
commit 1695cb2c04
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -1,6 +1,6 @@
;; Install this file as /etc/guix/machines.scm on berlin.guix.gnu.org
(add-to-load-path "/root/maintenance/hydra/modules")
(use-modules (ice-9 match) (srfi srfi-1) (sysadmin build-machines))
(use-modules (ice-9 match) (srfi srfi-1))
;; 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.
@ -313,15 +313,20 @@
(define build-machine-name
(@@ (guix scripts offload) build-machine-name))
(define (childhurd-ip? ip) ;XXX: copied from (sysadmin build-machines)
"Return #t if IP should be running a Childhurd: the first two
nodes."
(member ip '("141.80.167.158" "141.80.167.159")))
(let* ((x86_64 (map template-x86_64 hosts))
(fast (filter-map
(match-lambda
((name key 128)
(find (lambda (machine)
(string=? (build-machine-name machine) name))
x86_64))
(_ #f))
hosts))
x86_64))
(_ #f))
hosts))
(fast/hurd (filter (compose childhurd-ip? build-machine-name) fast)))
(append overdrive
honeycomb