[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: hydra: machines-for-berlin: Remove dependency on
From: |
Ludovic Courtès |
Subject: |
branch master updated: hydra: machines-for-berlin: Remove dependency on (sysadmin …) modules. |
Date: |
Thu, 09 Jun 2022 03:18:28 -0400 |
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 1695cb2 hydra: machines-for-berlin: Remove dependency on (sysadmin …)
modules.
1695cb2 is described below
commit 1695cb2c04ccf49971b3dedf0e0e58a3274b6c7c
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Jun 9 09:16:12 2022 +0200
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.
---
hydra/machines-for-berlin.scm | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index d56fa4b..6744d52 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: hydra: machines-for-berlin: Remove dependency on (sysadmin …) modules.,
Ludovic Courtès <=